From d9884b5ffd8fb68673b9cd5458a6bced4ed58da8 Mon Sep 17 00:00:00 2001 From: Rudy Ges Date: Wed, 4 Oct 2023 11:20:20 +0200 Subject: [PATCH] [tests] adjust for macro API changes --- .../user-defined-define-json-fail.hxml.stderr | 2 +- .../user-defined-meta-json-fail.hxml.stderr | 2 +- ...-defined-meta-json-indent-fail.hxml.stderr | 2 +- ...-defined-meta-json-pretty-fail.hxml.stderr | 4 +- tests/misc/projects/Issue3500/Main.hx | 25 ++++++---- .../{issue5002 => Issue5002}/Macro.hx | 0 .../projects/{issue5002 => Issue5002}/Main.hx | 0 .../{issue5002 => Issue5002}/Main2.hx | 0 tests/misc/projects/Issue5002/Main3.hx | 24 +++++++++ .../{issue5002 => Issue5002}/Main4.hx | 0 .../compile-fail.hxml | 0 .../compile-fail.hxml.stderr | 0 .../compile2-fail.hxml | 0 .../compile2-fail.hxml.stderr | 0 .../compile3-fail.hxml | 0 .../Issue5002/compile3-fail.hxml.stderr | 6 +++ .../compile4-fail.hxml | 0 .../compile4-fail.hxml.stderr | 0 tests/misc/projects/Issue7871/Macro.hx | 15 ++++-- .../projects/Issue7871/compile-1-fail.hxml | 1 + .../Issue7871/compile-1-fail.hxml.stderr | 4 ++ .../misc/projects/Issue7871/compile-fail.hxml | 2 +- .../Issue7871/compile-fail.hxml.stderr | 7 +-- .../projects/Issue7871/compile-next-fail.hxml | 2 - .../Issue7871/compile-next-fail.hxml.stderr | 7 --- tests/misc/projects/Issue8019/Macro.hx | 50 ++++++++++--------- tests/misc/projects/Issue8019/Macro2.hx | 28 ++++++----- .../Issue8019/compile-fail.hxml.stderr | 36 ++++++------- .../Issue8019/compile3-fail.hxml.stderr | 6 +-- tests/misc/projects/issue5002/Main3.hx | 22 -------- .../issue5002/compile3-fail.hxml.stderr | 6 --- .../recursive-callbacks/compile.hxml.stderr | 1 - 32 files changed, 130 insertions(+), 122 deletions(-) rename tests/misc/projects/{issue5002 => Issue5002}/Macro.hx (100%) rename tests/misc/projects/{issue5002 => Issue5002}/Main.hx (100%) rename tests/misc/projects/{issue5002 => Issue5002}/Main2.hx (100%) create mode 100644 tests/misc/projects/Issue5002/Main3.hx rename tests/misc/projects/{issue5002 => Issue5002}/Main4.hx (100%) rename tests/misc/projects/{issue5002 => Issue5002}/compile-fail.hxml (100%) rename tests/misc/projects/{issue5002 => Issue5002}/compile-fail.hxml.stderr (100%) rename tests/misc/projects/{issue5002 => Issue5002}/compile2-fail.hxml (100%) rename tests/misc/projects/{issue5002 => Issue5002}/compile2-fail.hxml.stderr (100%) rename tests/misc/projects/{issue5002 => Issue5002}/compile3-fail.hxml (100%) create mode 100644 tests/misc/projects/Issue5002/compile3-fail.hxml.stderr rename tests/misc/projects/{issue5002 => Issue5002}/compile4-fail.hxml (100%) rename tests/misc/projects/{issue5002 => Issue5002}/compile4-fail.hxml.stderr (100%) create mode 100644 tests/misc/projects/Issue7871/compile-1-fail.hxml create mode 100644 tests/misc/projects/Issue7871/compile-1-fail.hxml.stderr delete mode 100644 tests/misc/projects/Issue7871/compile-next-fail.hxml delete mode 100644 tests/misc/projects/Issue7871/compile-next-fail.hxml.stderr delete mode 100644 tests/misc/projects/issue5002/Main3.hx delete mode 100644 tests/misc/projects/issue5002/compile3-fail.hxml.stderr diff --git a/tests/misc/projects/Issue10844/user-defined-define-json-fail.hxml.stderr b/tests/misc/projects/Issue10844/user-defined-define-json-fail.hxml.stderr index df6e5f4c24b..60cf3bac680 100644 --- a/tests/misc/projects/Issue10844/user-defined-define-json-fail.hxml.stderr +++ b/tests/misc/projects/Issue10844/user-defined-define-json-fail.hxml.stderr @@ -1,3 +1,3 @@ (unknown) : Uncaught exception Could not read file define.jsno -$$normPath(::std::)/haxe/macro/Compiler.hx:509: characters 11-39 : Called from here +$$normPath(::std::)/haxe/macro/Compiler.hx:505: characters 11-39 : Called from here (unknown) : Called from here diff --git a/tests/misc/projects/Issue10844/user-defined-meta-json-fail.hxml.stderr b/tests/misc/projects/Issue10844/user-defined-meta-json-fail.hxml.stderr index 56e309fd80e..ced31cb8f78 100644 --- a/tests/misc/projects/Issue10844/user-defined-meta-json-fail.hxml.stderr +++ b/tests/misc/projects/Issue10844/user-defined-meta-json-fail.hxml.stderr @@ -1,3 +1,3 @@ (unknown) : Uncaught exception Could not read file meta.jsno -$$normPath(::std::)/haxe/macro/Compiler.hx:498: characters 11-39 : Called from here +$$normPath(::std::)/haxe/macro/Compiler.hx:494: characters 11-39 : Called from here (unknown) : Called from here diff --git a/tests/misc/projects/Issue10844/user-defined-meta-json-indent-fail.hxml.stderr b/tests/misc/projects/Issue10844/user-defined-meta-json-indent-fail.hxml.stderr index d545c66d944..9a4f93d7093 100644 --- a/tests/misc/projects/Issue10844/user-defined-meta-json-indent-fail.hxml.stderr +++ b/tests/misc/projects/Issue10844/user-defined-meta-json-indent-fail.hxml.stderr @@ -1,3 +1,3 @@ (unknown) : Uncaught exception Could not read file meta.jsno - $$normPath(::std::)/haxe/macro/Compiler.hx:498: characters 11-39 : Called from here + $$normPath(::std::)/haxe/macro/Compiler.hx:494: characters 11-39 : Called from here (unknown) : Called from here diff --git a/tests/misc/projects/Issue10844/user-defined-meta-json-pretty-fail.hxml.stderr b/tests/misc/projects/Issue10844/user-defined-meta-json-pretty-fail.hxml.stderr index ee586a92f90..2160c2c1753 100644 --- a/tests/misc/projects/Issue10844/user-defined-meta-json-pretty-fail.hxml.stderr +++ b/tests/misc/projects/Issue10844/user-defined-meta-json-pretty-fail.hxml.stderr @@ -2,9 +2,9 @@ | Uncaught exception Could not read file meta.jsno - -> $$normPath(::std::)/haxe/macro/Compiler.hx:498: characters 11-39 + -> $$normPath(::std::)/haxe/macro/Compiler.hx:494: characters 11-39 - 498 | var f = sys.io.File.getContent(path); + 494 | var f = sys.io.File.getContent(path); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | Called from here diff --git a/tests/misc/projects/Issue3500/Main.hx b/tests/misc/projects/Issue3500/Main.hx index da650cbd548..4b9e8577129 100644 --- a/tests/misc/projects/Issue3500/Main.hx +++ b/tests/misc/projects/Issue3500/Main.hx @@ -1,18 +1,21 @@ class Main { static function test() { - var t = haxe.macro.Context.getType("A"); function fail(msg) { Sys.println(msg); Sys.exit(1); } - switch (t) { - case TAbstract(a, _): - var hasTestMeta = Lambda.exists(a.get().impl.get().meta.get(), function(m) return m.name == ":test"); - if (!hasTestMeta) { - fail("Abstract implementation class has no @:test metadata"); - } - case _: - fail("Should be abstract"); - } + + haxe.macro.Context.onAfterInitMacros(() -> { + var t = haxe.macro.Context.getType("A"); + switch (t) { + case TAbstract(a, _): + var hasTestMeta = Lambda.exists(a.get().impl.get().meta.get(), function(m) return m.name == ":test"); + if (!hasTestMeta) { + fail("Abstract implementation class has no @:test metadata"); + } + case _: + fail("Should be abstract"); + } + }); } -} \ No newline at end of file +} diff --git a/tests/misc/projects/issue5002/Macro.hx b/tests/misc/projects/Issue5002/Macro.hx similarity index 100% rename from tests/misc/projects/issue5002/Macro.hx rename to tests/misc/projects/Issue5002/Macro.hx diff --git a/tests/misc/projects/issue5002/Main.hx b/tests/misc/projects/Issue5002/Main.hx similarity index 100% rename from tests/misc/projects/issue5002/Main.hx rename to tests/misc/projects/Issue5002/Main.hx diff --git a/tests/misc/projects/issue5002/Main2.hx b/tests/misc/projects/Issue5002/Main2.hx similarity index 100% rename from tests/misc/projects/issue5002/Main2.hx rename to tests/misc/projects/Issue5002/Main2.hx diff --git a/tests/misc/projects/Issue5002/Main3.hx b/tests/misc/projects/Issue5002/Main3.hx new file mode 100644 index 00000000000..0ac00fa2548 --- /dev/null +++ b/tests/misc/projects/Issue5002/Main3.hx @@ -0,0 +1,24 @@ +import haxe.macro.Context; + +class Main3 { + static function init() { + Context.onAfterInitMacros(() -> { + 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 similarity index 100% rename from tests/misc/projects/issue5002/Main4.hx rename to tests/misc/projects/Issue5002/Main4.hx diff --git a/tests/misc/projects/issue5002/compile-fail.hxml b/tests/misc/projects/Issue5002/compile-fail.hxml similarity index 100% rename from tests/misc/projects/issue5002/compile-fail.hxml rename to tests/misc/projects/Issue5002/compile-fail.hxml diff --git a/tests/misc/projects/issue5002/compile-fail.hxml.stderr b/tests/misc/projects/Issue5002/compile-fail.hxml.stderr similarity index 100% rename from tests/misc/projects/issue5002/compile-fail.hxml.stderr rename to tests/misc/projects/Issue5002/compile-fail.hxml.stderr diff --git a/tests/misc/projects/issue5002/compile2-fail.hxml b/tests/misc/projects/Issue5002/compile2-fail.hxml similarity index 100% rename from tests/misc/projects/issue5002/compile2-fail.hxml rename to tests/misc/projects/Issue5002/compile2-fail.hxml diff --git a/tests/misc/projects/issue5002/compile2-fail.hxml.stderr b/tests/misc/projects/Issue5002/compile2-fail.hxml.stderr similarity index 100% rename from tests/misc/projects/issue5002/compile2-fail.hxml.stderr rename to tests/misc/projects/Issue5002/compile2-fail.hxml.stderr diff --git a/tests/misc/projects/issue5002/compile3-fail.hxml b/tests/misc/projects/Issue5002/compile3-fail.hxml similarity index 100% rename from tests/misc/projects/issue5002/compile3-fail.hxml rename to tests/misc/projects/Issue5002/compile3-fail.hxml 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 00000000000..e9fa20b2b30 --- /dev/null +++ b/tests/misc/projects/Issue5002/compile3-fail.hxml.stderr @@ -0,0 +1,6 @@ +Main3.hx:10: characters 18-19 : Module "lowercase" does not have a valid name. Module name should start with an uppercase letter: "lowercase" +Main3.hx:10: characters 18-19 : Module "0_class" does not have a valid name. "0_class" is not a valid module name. +Main3.hx:10: characters 18-19 : Module "0_enum" does not have a valid name. "0_enum" is not a valid module name. +Main3.hx:10: characters 18-19 : Module "0_struct" does not have a valid name. "0_struct" is not a valid module name. +Main3.hx:10: characters 18-19 : "0_abstract_Impl_" is not a valid type name. +Main3.hx:10: characters 18-19 : Module "0_abstract" does not have a valid name. "0_abstract" is not a valid module name. diff --git a/tests/misc/projects/issue5002/compile4-fail.hxml b/tests/misc/projects/Issue5002/compile4-fail.hxml similarity index 100% rename from tests/misc/projects/issue5002/compile4-fail.hxml rename to tests/misc/projects/Issue5002/compile4-fail.hxml diff --git a/tests/misc/projects/issue5002/compile4-fail.hxml.stderr b/tests/misc/projects/Issue5002/compile4-fail.hxml.stderr similarity index 100% rename from tests/misc/projects/issue5002/compile4-fail.hxml.stderr rename to tests/misc/projects/Issue5002/compile4-fail.hxml.stderr diff --git a/tests/misc/projects/Issue7871/Macro.hx b/tests/misc/projects/Issue7871/Macro.hx index 2ff336cb75e..b8efaf342cb 100644 --- a/tests/misc/projects/Issue7871/Macro.hx +++ b/tests/misc/projects/Issue7871/Macro.hx @@ -2,14 +2,11 @@ import haxe.macro.Compiler; import haxe.macro.Context; function init() { - var e = macro 42; - Context.typeof(e); if (Context.defined("haxe")) Context.warning("ok", (macro 0).pos); - Compiler.define("foo", "foo"); Context.onAfterInitMacros(() -> { Context.warning("after init 1", (macro 0).pos); - Compiler.define("bar", "bar"); + var e = macro 42; Context.typeof(e); }); Compiler.include("hax.ds", true, true); @@ -17,3 +14,13 @@ function init() { Context.warning("after init 2", (macro 0).pos); }); } + +function init_fail() { + var e = macro 42; + Context.typeof(e); + Compiler.define("foo", "foo"); + + Context.onAfterInitMacros(() -> { + Compiler.define("bar", "bar"); + }); +} diff --git a/tests/misc/projects/Issue7871/compile-1-fail.hxml b/tests/misc/projects/Issue7871/compile-1-fail.hxml new file mode 100644 index 00000000000..a838b3a019d --- /dev/null +++ b/tests/misc/projects/Issue7871/compile-1-fail.hxml @@ -0,0 +1 @@ +--macro Macro.init() diff --git a/tests/misc/projects/Issue7871/compile-1-fail.hxml.stderr b/tests/misc/projects/Issue7871/compile-1-fail.hxml.stderr new file mode 100644 index 00000000000..99c8d656e6b --- /dev/null +++ b/tests/misc/projects/Issue7871/compile-1-fail.hxml.stderr @@ -0,0 +1,4 @@ +Macro.hx:5: characters 60-61 : Warning : ok +Macro.hx:8: characters 42-43 : Warning : after init 1 +Package "hax.ds" was not found in any of class paths +Macro.hx:14: characters 42-43 : Warning : after init 2 diff --git a/tests/misc/projects/Issue7871/compile-fail.hxml b/tests/misc/projects/Issue7871/compile-fail.hxml index a838b3a019d..18ee1d54a38 100644 --- a/tests/misc/projects/Issue7871/compile-fail.hxml +++ b/tests/misc/projects/Issue7871/compile-fail.hxml @@ -1 +1 @@ ---macro Macro.init() +--macro Macro.init_fail() diff --git a/tests/misc/projects/Issue7871/compile-fail.hxml.stderr b/tests/misc/projects/Issue7871/compile-fail.hxml.stderr index eccec2456a0..6ef73b53721 100644 --- a/tests/misc/projects/Issue7871/compile-fail.hxml.stderr +++ b/tests/misc/projects/Issue7871/compile-fail.hxml.stderr @@ -1,5 +1,2 @@ -Macro.hx:7: characters 60-61 : Warning : ok -Macro.hx:11: characters 42-43 : Warning : after init 1 -Macro.hx:12: characters 3-32 : Warning : This API should only be used from initialization macros. -Package "hax.ds" was not found in any of class paths -Macro.hx:17: characters 42-43 : Warning : after init 2 +Macro.hx:20: characters 2-19 : Cannot use this API from initialization macros. +Macro.hx:20: characters 2-19 : ... Use `Context.onAfterInitMacros` to register a callback to run when context is ready. diff --git a/tests/misc/projects/Issue7871/compile-next-fail.hxml b/tests/misc/projects/Issue7871/compile-next-fail.hxml deleted file mode 100644 index f4272930fd3..00000000000 --- a/tests/misc/projects/Issue7871/compile-next-fail.hxml +++ /dev/null @@ -1,2 +0,0 @@ -compile-fail.hxml --D haxe-next diff --git a/tests/misc/projects/Issue7871/compile-next-fail.hxml.stderr b/tests/misc/projects/Issue7871/compile-next-fail.hxml.stderr deleted file mode 100644 index 76209e88997..00000000000 --- a/tests/misc/projects/Issue7871/compile-next-fail.hxml.stderr +++ /dev/null @@ -1,7 +0,0 @@ -Macro.hx:6: characters 2-19 : Warning : Cannot use this API from initialization macros. -Macro.hx:6: characters 2-19 : ... Use `Context.onAfterInitMacros` to register a callback to run when context is ready. -Macro.hx:7: characters 60-61 : Warning : ok -Macro.hx:11: characters 42-43 : Warning : after init 1 -Macro.hx:12: characters 3-32 : Warning : This API should only be used from initialization macros. -Package "hax.ds" was not found in any of class paths -Macro.hx:17: characters 42-43 : Warning : after init 2 diff --git a/tests/misc/projects/Issue8019/Macro.hx b/tests/misc/projects/Issue8019/Macro.hx index bd4be76901c..cce25fac4d6 100644 --- a/tests/misc/projects/Issue8019/Macro.hx +++ b/tests/misc/projects/Issue8019/Macro.hx @@ -3,32 +3,34 @@ 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: [] - }); - } + Context.onAfterInitMacros(() -> { + function defineType(pack, kind) { + Context.defineType({ + pos: (macro 0).pos, + pack: pack, + name: 'Test', + kind: kind, + fields: [] + }); + } - function defineClass(pack) { - defineType(pack, TDClass()); - } + function defineClass(pack) { + defineType(pack, TDClass()); + } - defineClass(["Module"]); - defineClass(["pack", "Module"]); + 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"}))); + 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 index f9b1c84a80f..4a5cc99ef2c 100644 --- a/tests/misc/projects/Issue8019/Macro2.hx +++ b/tests/misc/projects/Issue8019/Macro2.hx @@ -2,20 +2,22 @@ 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: [] - }]); - } + Context.onAfterInitMacros(() -> { + function defineModule(name:String) { + Context.defineModule(name, [{ + pos: (macro 0).pos, + pack: [], + name: name, + kind: TDClass(), + fields: [] + }]); + } - defineModule("Valid"); + defineModule("Valid"); - defineModule(""); - defineModule("0"); - defineModule("Type+"); + defineModule(""); + defineModule("0"); + defineModule("Type+"); + }); } } diff --git a/tests/misc/projects/Issue8019/compile-fail.hxml.stderr b/tests/misc/projects/Issue8019/compile-fail.hxml.stderr index b6f3cedc99f..c54670e72e9 100644 --- a/tests/misc/projects/Issue8019/compile-fail.hxml.stderr +++ b/tests/misc/projects/Issue8019/compile-fail.hxml.stderr @@ -1,18 +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 +Macro.hx:9: characters 18-19 : "" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must not be empty +Macro.hx:9: characters 18-19 : "\n" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must start with a lowercase letter +Macro.hx:9: characters 18-19 : "pack\n" is not a valid package name: +Macro.hx:9: characters 18-19 : Invalid character: \n +Macro.hx:9: characters 18-19 : "pack~" is not a valid package name: +Macro.hx:9: characters 18-19 : Invalid character: ~ +Macro.hx:9: characters 18-19 : "Foo" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must start with a lowercase letter +Macro.hx:9: characters 18-19 : "0_class" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must start with a lowercase letter +Macro.hx:9: characters 18-19 : "0_enum" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must start with a lowercase letter +Macro.hx:9: characters 18-19 : "0_structure" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must start with a lowercase letter +Macro.hx:9: characters 18-19 : "0_abstract" is not a valid package name: +Macro.hx:9: characters 18-19 : Package name must start with a lowercase letter diff --git a/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr b/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr index 4db3fc6982d..9d1f02a9c16 100644 --- a/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr +++ b/tests/misc/projects/Issue8019/compile3-fail.hxml.stderr @@ -1,3 +1,3 @@ -Macro2.hx:7: characters 17-18 : Module "" does not have a valid name. Module name must not be empty. -Macro2.hx:7: characters 17-18 : Module "0" does not have a valid name. "0" is not a valid module name. -Macro2.hx:7: characters 17-18 : Module "Type+" does not have a valid name. "Type+" is not a valid module name. \ No newline at end of file +Macro2.hx:8: characters 18-19 : Module "" does not have a valid name. Module name must not be empty. +Macro2.hx:8: characters 18-19 : Module "0" does not have a valid name. "0" is not a valid module name. +Macro2.hx:8: characters 18-19 : Module "Type+" does not have a valid name. "Type+" is not a valid module name. diff --git a/tests/misc/projects/issue5002/Main3.hx b/tests/misc/projects/issue5002/Main3.hx deleted file mode 100644 index 2b425ceb838..00000000000 --- a/tests/misc/projects/issue5002/Main3.hx +++ /dev/null @@ -1,22 +0,0 @@ -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/compile3-fail.hxml.stderr b/tests/misc/projects/issue5002/compile3-fail.hxml.stderr deleted file mode 100644 index 4310e3252f3..00000000000 --- a/tests/misc/projects/issue5002/compile3-fail.hxml.stderr +++ /dev/null @@ -1,6 +0,0 @@ -Main3.hx:9: characters 17-18 : Module "lowercase" does not have a valid name. Module name should start with an uppercase letter: "lowercase" -Main3.hx:9: characters 17-18 : Module "0_class" does not have a valid name. "0_class" is not a valid module name. -Main3.hx:9: characters 17-18 : Module "0_enum" does not have a valid name. "0_enum" is not a valid module name. -Main3.hx:9: characters 17-18 : Module "0_struct" does not have a valid name. "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 : Module "0_abstract" does not have a valid name. "0_abstract" is not a valid module name. \ No newline at end of file diff --git a/tests/misc/projects/recursive-callbacks/compile.hxml.stderr b/tests/misc/projects/recursive-callbacks/compile.hxml.stderr index cf44340f699..0b49ab58eee 100644 --- a/tests/misc/projects/recursive-callbacks/compile.hxml.stderr +++ b/tests/misc/projects/recursive-callbacks/compile.hxml.stderr @@ -1,5 +1,4 @@ Main.hx:5: characters 20-24 : Warning : 1 -Main.hx:9: lines 9-11 : Warning : This API should only be used from initialization macros. Main.hx:5: characters 20-24 : Warning : 2 Main.hx:5: characters 20-24 : Warning : 3 Main.hx:5: characters 20-24 : Warning : 4