ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-07-03 07:24:58 +03:00
Code Issues Projects Releases Wiki Activity

Removed some unreachable code causing compiler warnings

Browse source
This commit is contained in:
Graham Nelson 2022-04-10 16:47:32 +01:00
parent 06272f08e0
commit d25ed3f1be
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inform6/inform6.mk
View file

@ -9,16 +9,18 @@ INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -ferror-limit=1000 MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return -ferror-limit=1000
FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return
LINK = clang $(CCOPTS) -g LINK = clang $(CCOPTS) -g
LINKEROPTS = LINKEROPTS =
EXEEXTENSION =
ARTOOL = libtool -o ARTOOL = libtool -o
INFORM6OS = OSX INFORM6OS = MACOS
GLULXEOS = OS_UNIX GLULXEOS = OS_UNIX

1
inter/building-module/Chapter 1/Packaging.w
View file

@ -216,6 +216,7 @@ packaging_state Packaging::enter_home_of(inter_name *N) {
} }
packaging_state Packaging::enter(package_request *R) { packaging_state Packaging::enter(package_request *R) {
if (R == NULL) internal_error("no such package request");
LOGIF(PACKAGING, "Entering $X\n", R); LOGIF(PACKAGING, "Entering $X\n", R);
packaging_state save = R->tree->site.spdata.current_state; packaging_state save = R->tree->site.spdata.current_state;
Packaging::incarnate(R); Packaging::incarnate(R);

10
inter/building-test/building-test.mk
View file

@ -9,16 +9,18 @@ INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -ferror-limit=1000 MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return -ferror-limit=1000
FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return
LINK = clang $(CCOPTS) -g LINK = clang $(CCOPTS) -g
LINKEROPTS = LINKEROPTS =
EXEEXTENSION =
ARTOOL = libtool -o ARTOOL = libtool -o
INFORM6OS = OSX INFORM6OS = MACOS
GLULXEOS = OS_UNIX GLULXEOS = OS_UNIX
@ -27,7 +29,7 @@ INTEST = /Users/gnelson/Natural\ Inform/intest/Tangled/intest
MYNAME = building-test MYNAME = building-test
ME = inter/building-test ME = inter/building-test
$(ME)/Tangled/$(MYNAME): inter/building-test/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Preliminaries/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Chapter*/*.w inter/building-test/../building-module/Chapter*/*.w inter/building-test/../bytecode-module/Preliminaries/*.w inter/building-test/../bytecode-module/Chapter*/*.w inter/building-test/../../services/words-module/Preliminaries/*.w inter/building-test/../../services/words-module/Chapter*/*.w inter/building-test/Chapter*/*.w $(ME)/Tangled/$(MYNAME): inter/building-test/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Preliminaries/*.w /Users/gnelson/Natural\ Inform/inweb/foundation-module/Chapter*/*.w inter/building-test/../bytecode-module/Preliminaries/*.w inter/building-test/../bytecode-module/Chapter*/*.w inter/building-test/../building-module/Preliminaries/*.w inter/building-test/../building-module/Chapter*/*.w inter/building-test/../../services/arch-module/Preliminaries/*.w inter/building-test/../../services/arch-module/Chapter*/*.w inter/building-test/../../services/words-module/Preliminaries/*.w inter/building-test/../../services/words-module/Chapter*/*.w inter/building-test/Chapter*/*.w
$(call make-me) $(call make-me)
.PHONY: force .PHONY: force

1
inter/index-module/Chapter 4/Map Configuration.w
View file

@ -126,7 +126,6 @@ int ConfigureIndexMap::get_map_variable_index(text_stream *name, index_session *
if (s < 0) { if (s < 0) {
LOG("Tried to look up <%S>\n", name); LOG("Tried to look up <%S>\n", name);
internal_error("looked up non-existent map variable"); internal_error("looked up non-existent map variable");
s = 0;
} }
return s; return s;
} }

8
retrospective/makefile
View file

@ -9,16 +9,18 @@ INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.6 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -ferror-limit=1000 MANYWARNINGS = -Weverything -Wno-pointer-arith -Wno-unused-macros -Wno-shadow -Wno-cast-align -Wno-variadic-macros -Wno-missing-noreturn -Wno-missing-prototypes -Wno-unused-parameter -Wno-padded -Wno-missing-variable-declarations -Wno-unreachable-code-break -Wno-class-varargs -Wno-format-nonliteral -Wno-cast-qual -Wno-double-promotion -Wno-comma -Wno-strict-prototypes -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return -ferror-limit=1000
FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt FEWERWARNINGS = -Wno-implicit-int -Wno-dangling-else -Wno-pointer-sign -Wno-format-extra-args -Wno-tautological-compare -Wno-deprecated-declarations -Wno-logical-op-parentheses -Wno-format -Wno-extra-semi-stmt -Wno-c11-extensions -Wno-unreachable-code-return
LINK = clang $(CCOPTS) -g LINK = clang $(CCOPTS) -g
LINKEROPTS = LINKEROPTS =
EXEEXTENSION =
ARTOOL = libtool -o ARTOOL = libtool -o
INFORM6OS = OSX INFORM6OS = MACOS
GLULXEOS = OS_UNIX GLULXEOS = OS_UNIX