From 4f5ce7b278487cefb53cfa1d5b4fe6682f11c693 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Mon, 5 Apr 2021 19:20:30 -0600 Subject: [PATCH] Fix haxe 4.2 type error --- .travis.yml | 2 +- kiss/src/kiss/Kiss.hx | 1 - kiss/src/kiss/List.hx | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e445c04..eb1dffa7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ os: - windows haxe: - stable -# - development + - development env: - KISS_TARGET=cpp - KISS_TARGET=interp diff --git a/kiss/src/kiss/Kiss.hx b/kiss/src/kiss/Kiss.hx index 7148a06b..cabdab0c 100644 --- a/kiss/src/kiss/Kiss.hx +++ b/kiss/src/kiss/Kiss.hx @@ -176,7 +176,6 @@ class Kiss { } fields; case CallExp({pos: _, def: Symbol(mac)}, args) if (macros.exists(mac)): - trace(mac); var expandedExp = macros[mac](exp, args, k); if (expandedExp != null) readerExpToFields(expandedExp, k, errorIfNot) else []; case CallExp({pos: _, def: Symbol(alias)}, args) if (callAliases.exists(alias)): diff --git a/kiss/src/kiss/List.hx b/kiss/src/kiss/List.hx index 77a7e256..3b635425 100644 --- a/kiss/src/kiss/List.hx +++ b/kiss/src/kiss/List.hx @@ -20,7 +20,7 @@ abstract List(Array) from Array to Array { } @:to - public function toArray() { + public function toArray() { return this; } @@ -29,7 +29,7 @@ abstract List(Array) from Array to Array { } @:arrayAccess - public inline function get(idx:Int):Null { + public inline function get(idx:Int):Null { return this[realIndex(idx)]; }