Skip to content

Commit c05f281

Browse files
committed
Eliminate callcontext cheat.
This in turn means PASTRegex - the library the remaining .pir cheats were placed into - can now also go away. This means we have no .pir files in the NQP repository, apart from the generated-from-NQP stage0.
1 parent 893a4d1 commit c05f281

File tree

3 files changed

+1
-78
lines changed

3 files changed

+1
-78
lines changed

src/PASTRegex.pir

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/cheats/parrot-callcontext.pir

Lines changed: 0 additions & 29 deletions
This file was deleted.

tools/build/Makefile.in

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ DYNEXT_DIR = dynext
5252
PMC_DIR = src/pmc
5353
OPS_DIR = src/ops
5454

55-
PAST_SOURCES = \
56-
src/PASTRegex.pir \
57-
src/cheats/parrot-callcontext.pir \
58-
5955
HLL_SOURCES = \
6056
src/HLL/Grammar.pm \
6157
src/HLL/Actions.pm \
@@ -145,8 +141,6 @@ MODULE_LOADER_PBC = ModuleLoader.pbc
145141

146142
REGEX_PBC = NQPRegex.pbc
147143

148-
PAST_PBC = PASTRegex.pbc
149-
150144
HLL_PBC = NQPHLL.pbc
151145
HLL_COMBINED = gen/NQPHLL.pm
152146
HLL_COMBINED_PIR = gen/NQPHLL.pir
@@ -492,7 +486,6 @@ CLEANUPS = \
492486
*.manifest \
493487
*.pdb \
494488
$(REGEX_PBC) \
495-
$(PAST_PBC) \
496489
$(HLL_PBC) \
497490
$(P6REGEX_PBC) \
498491
$(NQP_MO_PBC) \
@@ -536,7 +529,6 @@ all: $(NQP_EXE) $(P5QREGEX_PBC)
536529
install: all
537530
$(MKPATH) $(DESTDIR)$(PARROT_LIBRARY_DIR)
538531
$(CP) $(MODULE_LOADER_PBC) $(DESTDIR)$(PARROT_LIBRARY_DIR)/$(MODULE_LOADER_PBC)
539-
$(CP) $(PAST_PBC) $(DESTDIR)$(PARROT_LIBRARY_DIR)/$(PAST_PBC)
540532
$(MKPATH) $(DESTDIR)$(NQP_LANG_DIR)/lib
541533
$(CP) $(QAST_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/$(QAST_PBC)
542534
$(CP) $(QASTNODE_PBC) $(DESTDIR)$(NQP_LANG_DIR)/lib/$(QASTNODE_PBC)
@@ -557,12 +549,9 @@ stage0: $(STAGE0)
557549
stage1: $(STAGE1)
558550
stage2: $(STAGE2)
559551

560-
$(PAST_PBC): $(PAST_SOURCES) $(DYNEXT_TARGET)
561-
$(PARROT) -o $(PAST_PBC) $(PAST_SOURCES)
562-
563552
$(STAGE0): $(STAGE0_PBCS)
564553

565-
$(STAGE0_PBCS): $(DYNEXT_TARGET) $(PAST_PBC) $(STAGE0_SOURCES)
554+
$(STAGE0_PBCS): $(DYNEXT_TARGET) $(STAGE0_SOURCES)
566555
$(PARROT) -o $(STAGE0)/$(NQP_MO_PBC) src/stage0/NQPMO-s0.pir
567556
$(PARROT) -o $(STAGE0)/$(MODULE_LOADER_PBC) src/stage0/ModuleLoader-s0.pir
568557
$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/stage0/NQPCORE.setting-s0.pir

0 commit comments

Comments
 (0)