Stupid git didn't commit the files I told it to.

This commit is contained in:
David Given 2022-07-17 14:53:48 +02:00
parent 1ee6efabb0
commit 90c6f0274a
6 changed files with 22 additions and 22 deletions

View file

@ -1,10 +1,10 @@
definerule("yacc", definerule("bison",
{ {
srcs = { type="targets" }, srcs = { type="targets" },
commands = { commands = {
type="strings", type="strings",
default={ default={
"yacc -t -b %{dir}/y -d %{ins}" "bison -t -b %{dir}/y -d %{ins}"
} }
}, },
}, },

View file

@ -1,4 +1,4 @@
include("first/yacc.lua") include("first/bison.lua")
definerule("build_as", definerule("build_as",
{ {
@ -15,7 +15,7 @@ definerule("build_as",
} }
local preprocessedy = cppfile { local preprocessedy = cppfile {
name = e.name.."/yaccinput", name = e.name.."/bisoninput",
srcs = { "mach/proto/as/comm2.y" }, srcs = { "mach/proto/as/comm2.y" },
outleaf = "comm2.y", outleaf = "comm2.y",
deps = { deps = {
@ -27,8 +27,8 @@ definerule("build_as",
}, },
} }
local yaccfiles = yacc { local bisonfiles = bison {
name = e.name.."/yacc", name = e.name.."/bison",
srcs = { preprocessedy } srcs = { preprocessedy }
} }
@ -41,14 +41,14 @@ definerule("build_as",
"mach/proto/as/comm6.c", "mach/proto/as/comm6.c",
"mach/proto/as/comm7.c", "mach/proto/as/comm7.c",
"mach/proto/as/comm8.c", "mach/proto/as/comm8.c",
matching(filenamesof(yaccfiles), "%.c$") matching(filenamesof(bisonfiles), "%.c$")
), ),
deps = { deps = {
"h+emheaders", "h+emheaders",
"modules/src/object+lib", "modules/src/object+lib",
"modules/src/flt_arith+lib", "modules/src/flt_arith+lib",
archlib, archlib,
yaccfiles, bisonfiles,
e.deps e.deps
} }
} }

View file

@ -1,6 +1,6 @@
include("first/yacc.lua") include("first/bison.lua")
local cggparser = yacc { local cggparser = bison {
name = "cggparser", name = "cggparser",
srcs = { "./bootgram.y" } srcs = { "./bootgram.y" }
} }

View file

@ -1,4 +1,4 @@
include("first/yacc.lua") include("first/bison.lua")
flex { flex {
name = "flex", name = "flex",
@ -7,8 +7,8 @@ flex {
} }
} }
yacc { bison {
name = "yacc", name = "bison",
srcs = { srcs = {
"./gram.y", "./gram.y",
} }
@ -47,12 +47,12 @@ cprogram {
srcs = { srcs = {
"./iburg.c", "./iburg.c",
matching(filenamesof("+flex"), "%.c$"), matching(filenamesof("+flex"), "%.c$"),
matching(filenamesof("+yacc"), "%.c$") matching(filenamesof("+bison"), "%.c$")
}, },
deps = { deps = {
"./iburg.h", "./iburg.h",
"+lib", "+lib",
"+yacc", "+bison",
"modules/src/data+lib", "modules/src/data+lib",
"modules+headers", "modules+headers",
} }

View file

@ -1,6 +1,6 @@
include("first/yacc.lua") include("first/bison.lua")
local cggparser = yacc { local cggparser = bison {
name = "cggparser", name = "cggparser",
srcs = { "./cgg.y" } srcs = { "./cgg.y" }
} }

View file

@ -1,7 +1,7 @@
include("first/yacc.lua") include("first/bison.lua")
yacc { bison {
name = "yacc", name = "bison",
srcs = { "./mktab.y" } srcs = { "./mktab.y" }
} }
@ -19,13 +19,13 @@ local headers = {
cprogram { cprogram {
name = "mktab", name = "mktab",
srcs = { srcs = {
matching(filenamesof("+yacc"), "%.c$"), matching(filenamesof("+bison"), "%.c$"),
matching(filenamesof("+flex"), "%.c$"), matching(filenamesof("+flex"), "%.c$"),
}, },
deps = concat( deps = concat(
headers, headers,
"+flex", "+flex",
"+yacc", "+bison",
"modules/src/em_data+lib" "modules/src/em_data+lib"
) )
} }