From 665e4a3ca7a589ca080b4065afa4b7d43a08a223 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sat, 24 Apr 2021 20:34:47 -0600 Subject: [PATCH] Find files relative to build macro caller --- kiss/src/kiss/EmbeddedScript.hx | 4 ++++ kiss/src/kiss/Kiss.hx | 22 +++++++++++-------- kiss/src/test/cases/BasicTestCase.hx | 2 +- .../test/cases/CommentAtEndOfListTestCase.hx | 2 +- kiss/src/test/cases/DSLTestCase.hx | 2 +- kiss/src/test/cases/MacroTestCase.hx | 2 +- kiss/src/test/cases/ReaderMacroTestCase.hx | 2 +- projects/aoc/src/Main.hx | 2 +- projects/aoc/src/year2020/Adapters.hx | 2 +- projects/aoc/src/year2020/Bags.hx | 2 +- projects/aoc/src/year2020/BootCode.hx | 8 +++---- projects/aoc/src/year2020/Customs.hx | 2 +- projects/aoc/src/year2020/Evasion.hx | 2 +- projects/aoc/src/year2020/FerrySim.hx | 4 ++-- projects/aoc/src/year2020/Passports.hx | 2 +- projects/aoc/src/year2020/Passwords.hx | 2 +- projects/aoc/src/year2020/Seating.hx | 2 +- projects/aoc/src/year2020/Solutions.hx | 2 +- projects/aoc/src/year2020/SummingTuples.hx | 2 +- projects/aoc/src/year2020/Toboggan.hx | 2 +- projects/aoc/src/year2020/Util.hx | 2 +- projects/aoc/src/year2020/XMAS.hx | 2 +- projects/asciilib2/src/Main.hx | 2 +- projects/asciilib2/src/asciilib/Colors.hx | 2 +- projects/asciilib2/src/asciilib/Game.hx | 2 +- projects/asciilib2/src/asciilib/Graphics.hx | 2 +- projects/asciilib2/src/asciilib/Grid.hx | 2 +- projects/asciilib2/src/asciilib/Letters.hx | 2 +- projects/asciilib2/src/asciilib/Surface.hx | 2 +- projects/file-watch/src/Main.hx | 2 +- projects/flixel/rpg-tutorial/source/Coin.hx | 2 +- projects/flixel/rpg-tutorial/source/Enemy.hx | 2 +- projects/flixel/rpg-tutorial/source/FSM.hx | 2 +- projects/flixel/rpg-tutorial/source/Main.hx | 2 +- .../flixel/rpg-tutorial/source/MenuState.hx | 2 +- .../flixel/rpg-tutorial/source/PlayState.hx | 2 +- projects/flixel/rpg-tutorial/source/Player.hx | 2 +- projects/kiss-vscode/src/Main.hx | 2 +- projects/pdf-salad/src/Main.hx | 2 +- template/src/Main.hx | 2 +- 40 files changed, 59 insertions(+), 51 deletions(-) diff --git a/kiss/src/kiss/EmbeddedScript.hx b/kiss/src/kiss/EmbeddedScript.hx index 7e459d96..a7310c29 100644 --- a/kiss/src/kiss/EmbeddedScript.hx +++ b/kiss/src/kiss/EmbeddedScript.hx @@ -5,6 +5,7 @@ import haxe.macro.Expr; import haxe.macro.Context; import haxe.macro.PositionTools; import sys.io.File; +import haxe.io.Path; #end import kiss.Kiss; import kiss.cloner.Cloner; @@ -50,6 +51,8 @@ class EmbeddedScript { public static function build(dslFile:String, scriptFile:String):Array { var k = Kiss.defaultKissState(); + var classPath = Context.getPosInfos(Context.currentPos()).file; + var loadingDirectory = Path.directory(classPath); var classFields = Context.getBuildFields(); var commandList:Array = []; @@ -57,6 +60,7 @@ class EmbeddedScript { // This brings in the DSL's functions and global variables. // As a side-effect, it also fills the KissState with the macros and reader macros that make the DSL syntax classFields = classFields.concat(Kiss.build(dslFile, k)); + scriptFile = Path.join([loadingDirectory, scriptFile]); Reader.readAndProcess(Stream.fromFile(scriptFile), k, (nextExp) -> { var fields = Kiss.readerExpToFields(nextExp, k, false); diff --git a/kiss/src/kiss/Kiss.hx b/kiss/src/kiss/Kiss.hx index cabdab0c..f6eb9852 100644 --- a/kiss/src/kiss/Kiss.hx +++ b/kiss/src/kiss/Kiss.hx @@ -16,6 +16,7 @@ import kiss.cloner.Cloner; using kiss.Helpers; using kiss.Reader; using tink.MacroApi; +using haxe.io.Path; typedef ExprConversion = (ReaderExp) -> Expr; @@ -91,13 +92,17 @@ class Kiss { /** Build macro: add fields to a class from a corresponding .kiss file **/ - public static function build(kissFile:String, ?k:KissState, useClassFields = true):Array { + public static function build(?kissFile:String, ?k:KissState, useClassFields = true):Array { + var classPath = Context.getPosInfos(Context.currentPos()).file; + // (load... ) relative to the original file + var loadingDirectory = Path.directory(classPath); + if (kissFile == null) { + kissFile = classPath.withoutDirectory().withoutExtension().withExtension("kiss"); + } + return _try(() -> { var classFields:Array = if (useClassFields) Context.getBuildFields() else []; - var stream = Stream.fromFile(kissFile); - - // (load... ) relative to the original file - var loadingDirectory = Path.directory(kissFile); + var stream = Stream.fromFile(Path.join([loadingDirectory, kissFile])); if (k == null) k = defaultKissState(); @@ -112,13 +117,12 @@ class Kiss { nextExp.checkNumArgs(1, 1, "(load \"[file]\")"); switch (loadArgs[0].def) { case StrExp(otherKissFile): - var filePath = Path.join([loadingDirectory, otherKissFile]); - if (!k.loadedFiles.exists(filePath)) { - var loadedFields = Kiss.build(filePath, k, false); + if (!k.loadedFiles.exists(otherKissFile)) { + var loadedFields = Kiss.build(otherKissFile, k, false); for (field in loadedFields) { classFields.push(field); } - k.loadedFiles[filePath] = true; + k.loadedFiles[otherKissFile] = true; } default: throw CompileError.fromExp(loadArgs[0], "only argument to load should be a string literal"); diff --git a/kiss/src/test/cases/BasicTestCase.hx b/kiss/src/test/cases/BasicTestCase.hx index 8d0db9a8..e8286b8b 100644 --- a/kiss/src/test/cases/BasicTestCase.hx +++ b/kiss/src/test/cases/BasicTestCase.hx @@ -8,7 +8,7 @@ import haxe.ds.Option; using StringTools; -@:build(kiss.Kiss.build("kiss/src/test/cases/BasicTestCase.kiss")) +@:build(kiss.Kiss.build()) class BasicTestCase extends Test { function testStaticVar() { Assert.equals("Howdy", BasicTestCase.message); diff --git a/kiss/src/test/cases/CommentAtEndOfListTestCase.hx b/kiss/src/test/cases/CommentAtEndOfListTestCase.hx index 4923ec1e..edf08dd2 100644 --- a/kiss/src/test/cases/CommentAtEndOfListTestCase.hx +++ b/kiss/src/test/cases/CommentAtEndOfListTestCase.hx @@ -5,5 +5,5 @@ import utest.Test; import kiss.Prelude; import kiss.List; -@:build(kiss.Kiss.build("kiss/src/test/cases/CommentAtEndOfListTestCase.kiss")) +@:build(kiss.Kiss.build()) class CommentAtEndOfListTestCase extends Test {} diff --git a/kiss/src/test/cases/DSLTestCase.hx b/kiss/src/test/cases/DSLTestCase.hx index 334fbf18..abfa4fb9 100644 --- a/kiss/src/test/cases/DSLTestCase.hx +++ b/kiss/src/test/cases/DSLTestCase.hx @@ -15,5 +15,5 @@ class DSLTestCase extends Test { } } -@:build(kiss.EmbeddedScript.build("kiss/src/test/cases/DSL.kiss", "kiss/src/test/cases/DSLScript.dsl")) +@:build(kiss.EmbeddedScript.build("DSL.kiss", "DSLScript.dsl")) class DSLScript extends EmbeddedScript {} diff --git a/kiss/src/test/cases/MacroTestCase.hx b/kiss/src/test/cases/MacroTestCase.hx index 0b10ea1a..19499c67 100644 --- a/kiss/src/test/cases/MacroTestCase.hx +++ b/kiss/src/test/cases/MacroTestCase.hx @@ -8,7 +8,7 @@ import haxe.ds.Option; using StringTools; -@:build(kiss.Kiss.build("kiss/src/test/cases/MacroTestCase.kiss")) +@:build(kiss.Kiss.build()) class MacroTestCase extends Test { function testMultipleFieldForms() { Assert.equals(5, myVar); diff --git a/kiss/src/test/cases/ReaderMacroTestCase.hx b/kiss/src/test/cases/ReaderMacroTestCase.hx index 8617b716..b31be014 100644 --- a/kiss/src/test/cases/ReaderMacroTestCase.hx +++ b/kiss/src/test/cases/ReaderMacroTestCase.hx @@ -4,7 +4,7 @@ import utest.Test; import utest.Assert; import kiss.Prelude; -@:build(kiss.Kiss.build("kiss/src/test/cases/ReaderMacroTestCase.kiss")) +@:build(kiss.Kiss.build()) class ReaderMacroTestCase extends Test { function testReadBang() { Assert.equals("String that takes the rest of the line", ReaderMacroTestCase.myLine()); diff --git a/projects/aoc/src/Main.hx b/projects/aoc/src/Main.hx index d042a6ad..d2dfaa7f 100644 --- a/projects/aoc/src/Main.hx +++ b/projects/aoc/src/Main.hx @@ -5,5 +5,5 @@ import kiss.Prelude; import kiss.List; import year2020.Solutions as Solutions2020; -@:build(kiss.Kiss.build("src/Main.kiss")) +@:build(kiss.Kiss.build()) class Main {} diff --git a/projects/aoc/src/year2020/Adapters.hx b/projects/aoc/src/year2020/Adapters.hx index 020760ae..9e571c42 100644 --- a/projects/aoc/src/year2020/Adapters.hx +++ b/projects/aoc/src/year2020/Adapters.hx @@ -6,5 +6,5 @@ import year2020.Util; using StringTools; -@:build(kiss.Kiss.build("src/year2020/Adapters.kiss")) +@:build(kiss.Kiss.build()) class Adapters {} diff --git a/projects/aoc/src/year2020/Bags.hx b/projects/aoc/src/year2020/Bags.hx index cd4e2225..16ac4cc4 100644 --- a/projects/aoc/src/year2020/Bags.hx +++ b/projects/aoc/src/year2020/Bags.hx @@ -11,5 +11,5 @@ typedef ParentMap = Map>; // Color IS CONTAINED IN these colors typedef ChildMap = Map>; -@:build(kiss.Kiss.build("src/year2020/Bags.kiss")) +@:build(kiss.Kiss.build()) class Bags {} diff --git a/projects/aoc/src/year2020/BootCode.hx b/projects/aoc/src/year2020/BootCode.hx index f3458c4f..7cd46f61 100644 --- a/projects/aoc/src/year2020/BootCode.hx +++ b/projects/aoc/src/year2020/BootCode.hx @@ -3,14 +3,14 @@ package year2020; import kiss.EmbeddedScript; import kiss.Prelude; -@:build(kiss.EmbeddedScript.build("src/year2020/BootCodeDSL.kiss", "src/year2020/inputs/day8-example.txt")) +@:build(kiss.EmbeddedScript.build("BootCodeDSL.kiss", "inputs/day8-example.txt")) class BootCodeExample extends EmbeddedScript {} -@:build(kiss.EmbeddedScript.build("src/year2020/BootCodeDSL.kiss", "src/year2020/inputs/day8.txt")) +@:build(kiss.EmbeddedScript.build("BootCodeDSL.kiss", "inputs/day8.txt")) class BootCodeReal extends EmbeddedScript {} -@:build(kiss.EmbeddedScript.build("src/year2020/BootCodeFixDSL.kiss", "src/year2020/inputs/day8-example.txt")) +@:build(kiss.EmbeddedScript.build("BootCodeFixDSL.kiss", "inputs/day8-example.txt")) class BootCodeFixExample extends EmbeddedScript {} -@:build(kiss.EmbeddedScript.build("src/year2020/BootCodeFixDSL.kiss", "src/year2020/inputs/day8.txt")) +@:build(kiss.EmbeddedScript.build("BootCodeFixDSL.kiss", "inputs/day8.txt")) class BootCodeFix extends EmbeddedScript {} diff --git a/projects/aoc/src/year2020/Customs.hx b/projects/aoc/src/year2020/Customs.hx index b645db7e..2c07faac 100644 --- a/projects/aoc/src/year2020/Customs.hx +++ b/projects/aoc/src/year2020/Customs.hx @@ -5,5 +5,5 @@ import year2020.Util; using StringTools; -@:build(kiss.Kiss.build("src/year2020/Customs.kiss")) +@:build(kiss.Kiss.build()) class Customs {} diff --git a/projects/aoc/src/year2020/Evasion.hx b/projects/aoc/src/year2020/Evasion.hx index 9e9cca0b..3efe3f86 100644 --- a/projects/aoc/src/year2020/Evasion.hx +++ b/projects/aoc/src/year2020/Evasion.hx @@ -3,5 +3,5 @@ package year2020; import kiss.EmbeddedScript; import kiss.Prelude; -@:build(kiss.EmbeddedScript.build("src/year2020/EvasionDSL.kiss", "src/year2020/inputs/day12.txt")) +@:build(kiss.EmbeddedScript.build("EvasionDSL.kiss", "inputs/day12.txt")) class EvasionScript extends EmbeddedScript {} diff --git a/projects/aoc/src/year2020/FerrySim.hx b/projects/aoc/src/year2020/FerrySim.hx index 70821a98..eea510b7 100644 --- a/projects/aoc/src/year2020/FerrySim.hx +++ b/projects/aoc/src/year2020/FerrySim.hx @@ -10,8 +10,8 @@ typedef SeatsChanged = { changed:Bool }; -@:build(kiss.EmbeddedScript.build("src/year2020/FerrySimDSL.kiss", "src/year2020/inputs/day11-example.txt")) +@:build(kiss.EmbeddedScript.build("FerrySimDSL.kiss", "inputs/day11-example.txt")) class FerrySimExample extends EmbeddedScript {} -@:build(kiss.EmbeddedScript.build("src/year2020/FerrySimDSL.kiss", "src/year2020/inputs/day11.txt")) +@:build(kiss.EmbeddedScript.build("FerrySimDSL.kiss", "inputs/day11.txt")) class FerrySimReal extends EmbeddedScript {} diff --git a/projects/aoc/src/year2020/Passports.hx b/projects/aoc/src/year2020/Passports.hx index d62f97e3..ff2dfc87 100644 --- a/projects/aoc/src/year2020/Passports.hx +++ b/projects/aoc/src/year2020/Passports.hx @@ -5,5 +5,5 @@ import kiss.Stream; using StringTools; -@:build(kiss.Kiss.build("src/year2020/Passports.kiss")) +@:build(kiss.Kiss.build()) class Passports {} diff --git a/projects/aoc/src/year2020/Passwords.hx b/projects/aoc/src/year2020/Passwords.hx index cba23bf8..1d09366d 100644 --- a/projects/aoc/src/year2020/Passwords.hx +++ b/projects/aoc/src/year2020/Passwords.hx @@ -6,5 +6,5 @@ import year2020.Util; using StringTools; -@:build(kiss.Kiss.build("src/year2020/Passwords.kiss")) +@:build(kiss.Kiss.build()) class Passwords {} diff --git a/projects/aoc/src/year2020/Seating.hx b/projects/aoc/src/year2020/Seating.hx index c2f88f11..16f3aca5 100644 --- a/projects/aoc/src/year2020/Seating.hx +++ b/projects/aoc/src/year2020/Seating.hx @@ -5,5 +5,5 @@ import year2020.Util; using StringTools; -@:build(kiss.Kiss.build("src/year2020/Seating.kiss")) +@:build(kiss.Kiss.build()) class Seating {} diff --git a/projects/aoc/src/year2020/Solutions.hx b/projects/aoc/src/year2020/Solutions.hx index aa36a7cd..1531e779 100644 --- a/projects/aoc/src/year2020/Solutions.hx +++ b/projects/aoc/src/year2020/Solutions.hx @@ -18,5 +18,5 @@ import year2020.Adapters; import year2020.FerrySim; import year2020.Evasion; -@:build(kiss.Kiss.build("src/year2020/Solutions.kiss")) +@:build(kiss.Kiss.build()) class Solutions {} diff --git a/projects/aoc/src/year2020/SummingTuples.hx b/projects/aoc/src/year2020/SummingTuples.hx index 57e227dd..858500c2 100644 --- a/projects/aoc/src/year2020/SummingTuples.hx +++ b/projects/aoc/src/year2020/SummingTuples.hx @@ -2,5 +2,5 @@ package year2020; import kiss.Prelude; -@:build(kiss.Kiss.build("src/year2020/SummingTuples.kiss")) +@:build(kiss.Kiss.build()) class SummingTuples {} diff --git a/projects/aoc/src/year2020/Toboggan.hx b/projects/aoc/src/year2020/Toboggan.hx index ec1cf51d..a83045b2 100644 --- a/projects/aoc/src/year2020/Toboggan.hx +++ b/projects/aoc/src/year2020/Toboggan.hx @@ -3,5 +3,5 @@ package year2020; import kiss.Prelude; import year2020.Util; -@:build(kiss.Kiss.build("src/year2020/Toboggan.kiss")) +@:build(kiss.Kiss.build()) class Toboggan {} diff --git a/projects/aoc/src/year2020/Util.hx b/projects/aoc/src/year2020/Util.hx index e91ef0ee..0b56fc76 100644 --- a/projects/aoc/src/year2020/Util.hx +++ b/projects/aoc/src/year2020/Util.hx @@ -5,5 +5,5 @@ import kiss.Prelude; using StringTools; -@:build(kiss.Kiss.build("src/year2020/Util.kiss")) +@:build(kiss.Kiss.build()) class Util {} diff --git a/projects/aoc/src/year2020/XMAS.hx b/projects/aoc/src/year2020/XMAS.hx index 163de7c4..e4bf9e06 100644 --- a/projects/aoc/src/year2020/XMAS.hx +++ b/projects/aoc/src/year2020/XMAS.hx @@ -3,5 +3,5 @@ package year2020; import kiss.Prelude; import year2020.SummingTuples; -@:build(kiss.Kiss.build("src/year2020/XMAS.kiss")) +@:build(kiss.Kiss.build()) class XMAS {} diff --git a/projects/asciilib2/src/Main.hx b/projects/asciilib2/src/Main.hx index b56ec242..124fd584 100644 --- a/projects/asciilib2/src/Main.hx +++ b/projects/asciilib2/src/Main.hx @@ -4,5 +4,5 @@ import kiss.Kiss; import kiss.Prelude; import asciilib.Surface; -@:build(kiss.Kiss.build("src/Main.kiss")) +@:build(kiss.Kiss.build()) class Main {} diff --git a/projects/asciilib2/src/asciilib/Colors.hx b/projects/asciilib2/src/asciilib/Colors.hx index 272cdae1..4f34133b 100644 --- a/projects/asciilib2/src/asciilib/Colors.hx +++ b/projects/asciilib2/src/asciilib/Colors.hx @@ -11,5 +11,5 @@ typedef Color = { /** * The Colors class represents a 2D grid of colors. Under the hood, it's byte channels */ -@:build(kiss.Kiss.build("src/asciilib/Colors.kiss")) +@:build(kiss.Kiss.build()) class Colors {} diff --git a/projects/asciilib2/src/asciilib/Game.hx b/projects/asciilib2/src/asciilib/Game.hx index 1a5e00fe..149588e3 100644 --- a/projects/asciilib2/src/asciilib/Game.hx +++ b/projects/asciilib2/src/asciilib/Game.hx @@ -1,4 +1,4 @@ package asciilib; -@:build(kiss.Kiss.build("src/asciilib/Game.kiss")) +@:build(kiss.Kiss.build()) class Game {} diff --git a/projects/asciilib2/src/asciilib/Graphics.hx b/projects/asciilib2/src/asciilib/Graphics.hx index 957567c9..8d7c4108 100644 --- a/projects/asciilib2/src/asciilib/Graphics.hx +++ b/projects/asciilib2/src/asciilib/Graphics.hx @@ -1,4 +1,4 @@ package asciilib; -@:build(kiss.Kiss.build("src/asciilib/Graphics.kiss")) +@:build(kiss.Kiss.build()) class Graphics {} diff --git a/projects/asciilib2/src/asciilib/Grid.hx b/projects/asciilib2/src/asciilib/Grid.hx index 444c9b26..e119c46f 100644 --- a/projects/asciilib2/src/asciilib/Grid.hx +++ b/projects/asciilib2/src/asciilib/Grid.hx @@ -1,4 +1,4 @@ package asciilib; -@:build(kiss.Kiss.build("src/asciilib/Grid.kiss")) +@:build(kiss.Kiss.build()) class Grid {} diff --git a/projects/asciilib2/src/asciilib/Letters.hx b/projects/asciilib2/src/asciilib/Letters.hx index 69a2bd11..16ae83e4 100644 --- a/projects/asciilib2/src/asciilib/Letters.hx +++ b/projects/asciilib2/src/asciilib/Letters.hx @@ -1,4 +1,4 @@ package asciilib; -@:build(kiss.Kiss.build("src/asciilib/Letters.kiss")) +@:build(kiss.Kiss.build()) class Letters {} diff --git a/projects/asciilib2/src/asciilib/Surface.hx b/projects/asciilib2/src/asciilib/Surface.hx index 4e6a14d4..e6c5486b 100644 --- a/projects/asciilib2/src/asciilib/Surface.hx +++ b/projects/asciilib2/src/asciilib/Surface.hx @@ -2,5 +2,5 @@ package asciilib; import asciilib.Colors; -@:build(kiss.Kiss.build("src/asciilib/Surface.kiss")) +@:build(kiss.Kiss.build()) class Surface {} diff --git a/projects/file-watch/src/Main.hx b/projects/file-watch/src/Main.hx index 1ebdb044..36db1ef4 100644 --- a/projects/file-watch/src/Main.hx +++ b/projects/file-watch/src/Main.hx @@ -5,5 +5,5 @@ import sys.io.Process; import kiss.Kiss; import kiss.Prelude; -@:build(kiss.Kiss.build("src/Main.kiss")) +@:build(kiss.Kiss.build()) class Main {} diff --git a/projects/flixel/rpg-tutorial/source/Coin.hx b/projects/flixel/rpg-tutorial/source/Coin.hx index a92c686d..e814fa18 100644 --- a/projects/flixel/rpg-tutorial/source/Coin.hx +++ b/projects/flixel/rpg-tutorial/source/Coin.hx @@ -1,4 +1,4 @@ package; -@:build(kiss.Kiss.build("source/Coin.kiss")) +@:build(kiss.Kiss.build()) class Coin extends FlxSprite {} diff --git a/projects/flixel/rpg-tutorial/source/Enemy.hx b/projects/flixel/rpg-tutorial/source/Enemy.hx index ca3e0dc1..31bc4628 100644 --- a/projects/flixel/rpg-tutorial/source/Enemy.hx +++ b/projects/flixel/rpg-tutorial/source/Enemy.hx @@ -9,5 +9,5 @@ enum EnemyType BOSS; } -@:build(kiss.Kiss.build("source/Enemy.kiss")) +@:build(kiss.Kiss.build()) class Enemy extends FlxSprite {} diff --git a/projects/flixel/rpg-tutorial/source/FSM.hx b/projects/flixel/rpg-tutorial/source/FSM.hx index af95e6a6..406a299f 100644 --- a/projects/flixel/rpg-tutorial/source/FSM.hx +++ b/projects/flixel/rpg-tutorial/source/FSM.hx @@ -1,4 +1,4 @@ package; -@:build(kiss.Kiss.build("source/FSM.kiss")) +@:build(kiss.Kiss.build()) class FSM {} diff --git a/projects/flixel/rpg-tutorial/source/Main.hx b/projects/flixel/rpg-tutorial/source/Main.hx index b91269b6..db4ea47d 100644 --- a/projects/flixel/rpg-tutorial/source/Main.hx +++ b/projects/flixel/rpg-tutorial/source/Main.hx @@ -1,4 +1,4 @@ package; -@:build(kiss.Kiss.build("source/Main.kiss")) +@:build(kiss.Kiss.build()) class Main extends Sprite {} diff --git a/projects/flixel/rpg-tutorial/source/MenuState.hx b/projects/flixel/rpg-tutorial/source/MenuState.hx index 448a61d0..194f3747 100644 --- a/projects/flixel/rpg-tutorial/source/MenuState.hx +++ b/projects/flixel/rpg-tutorial/source/MenuState.hx @@ -1,4 +1,4 @@ package; -@:build(kiss.Kiss.build("source/MenuState.kiss")) +@:build(kiss.Kiss.build()) class MenuState extends FlxState {} diff --git a/projects/flixel/rpg-tutorial/source/PlayState.hx b/projects/flixel/rpg-tutorial/source/PlayState.hx index 5ef76e12..2a6cef94 100644 --- a/projects/flixel/rpg-tutorial/source/PlayState.hx +++ b/projects/flixel/rpg-tutorial/source/PlayState.hx @@ -1,4 +1,4 @@ package; -@:build(kiss.Kiss.build("source/PlayState.kiss")) +@:build(kiss.Kiss.build()) class PlayState extends FlxState {} diff --git a/projects/flixel/rpg-tutorial/source/Player.hx b/projects/flixel/rpg-tutorial/source/Player.hx index bdf7e3a6..a5d55fc5 100644 --- a/projects/flixel/rpg-tutorial/source/Player.hx +++ b/projects/flixel/rpg-tutorial/source/Player.hx @@ -1,4 +1,4 @@ package; -@:build(kiss.Kiss.build("source/Player.kiss")) +@:build(kiss.Kiss.build()) class Player extends FlxSprite {} diff --git a/projects/kiss-vscode/src/Main.hx b/projects/kiss-vscode/src/Main.hx index 9056ed5b..f8cf35d5 100644 --- a/projects/kiss-vscode/src/Main.hx +++ b/projects/kiss-vscode/src/Main.hx @@ -23,7 +23,7 @@ typedef KissConfig = { init:() -> Void }; -@:build(kiss.Kiss.build("src/Main.kiss")) +@:build(kiss.Kiss.build()) class Main { // TODO support EMeta(s:MetadataEntry, e:Expr) via Kiss so this signature can be moved to Main.kiss @:expose("activate") diff --git a/projects/pdf-salad/src/Main.hx b/projects/pdf-salad/src/Main.hx index 681c5e4e..e2e22c41 100644 --- a/projects/pdf-salad/src/Main.hx +++ b/projects/pdf-salad/src/Main.hx @@ -10,5 +10,5 @@ import Externs; using StringTools; -@:build(kiss.Kiss.build("src/Main.kiss")) +@:build(kiss.Kiss.build()) class Main {} diff --git a/template/src/Main.hx b/template/src/Main.hx index 30717faa..a2b9dd4d 100644 --- a/template/src/Main.hx +++ b/template/src/Main.hx @@ -3,5 +3,5 @@ package; import kiss.Kiss; import kiss.Prelude; -@:build(kiss.Kiss.build("src/Main.kiss")) +@:build(kiss.Kiss.build()) class Main {}