From: Emil Williams Date: Sat, 4 Jan 2025 21:40:55 +0000 (-0700) Subject: XOLATILE approved naming X-Git-Tag: v20250104~6 X-Git-Url: https://git.xolatile.top/?a=commitdiff_plain;h=03123a69d300c10c94c36cae29a2dbda2b53c86f;p=emil-bake.git XOLATILE approved naming --- diff --git a/awake b/awake index 82a01a4..d951b4e 100755 --- a/awake +++ b/awake @@ -69,7 +69,7 @@ BEGIN { if (list) { print bakenum": "$0 } else if (select == bakenum) { - gsub(/\$@|@(FILE|FILENAME|NAME)/, filename) + gsub(/\$@|@(FILE_NAME|FILENAME|FILE|NAME)/, filename) gsub(/\$\*|@SHORT/, shortname) gsub(/\$\+|@ARGS/, extraargs) gsub(/@RECURS/, ARGV[0]) diff --git a/bake.l b/bake.l index d38b089..50c3b31 100755 --- a/bake.l +++ b/bake.l @@ -28,7 +28,7 @@ extern void shorten(char * filename, int n); SPACE [ \t\r\v\f] /* Everything that can be backslashed */ -FILENAME (@FILENAME|@FILE|@NAME) +FILENAME (@FILE_NAME|@FILENAME|@FILE|@NAME) CMD @BAKE[[:space:]] MACROS ({CMD}|@STOP|{FILENAME}|@SHORT|@ARGS|@LINE|@RECURS|$@|$*|$+|@\{) diff --git a/shake b/shake index 51d3b5c..e2cf120 100755 --- a/shake +++ b/shake @@ -76,6 +76,7 @@ if [[ -n $line ]]; then line=${line//\$@/$input_file} line=${line//\$\*/${input_file%.*}} line=${line//\$+/$@} + line=${line//@FILE_NAME/$input_file} line=${line//@FILENAME/$input_file} line=${line//@SHORT/${input_file%.*}} line=${line//@ARGS/$@}