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

Fixed some 64-bit bugs

Browse source
This commit is contained in:
Graham Nelson 2019-02-10 23:10:04 +00:00
parent 0b72d7853a
commit 849f9d2832
29 changed files with 53 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-code.mk
View file

@ -1 +1 @@
BUILDCODE = 6Q15
BUILDCODE = 6Q16

5
inblorb/Contents.w
View file

@ -6,8 +6,8 @@ Declare Section Usage: Off
Licence: This is a free, open-source program published under the Artistic License 2.0.
Version Number: 4
Version Name: Duralumin
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Web Syntax Version: 2
Import: foundation
@ -37,3 +37,4 @@ Chapter 3: Other Material
Templates
Website Maker
Base64

2
inblorb/versions.txt
View file

@ -2,4 +2,4 @@ Sync to inform7
Amalgam 1 3K27 April 2006 Public launch
Brass 2 5Z71 April 2009 Faster and tidied up (renamed "cBlorb")
Chromoly 3 6E36 April 2010 Extended to release interpreters
Duralumin 4 *6Q15 8 February 2019 Unicode support (renamed "inblorb")
Duralumin 4 *6Q16 10 February 2019 Unicode support (renamed "inblorb")

7
indoc/Contents.w
View file

@ -1,14 +1,14 @@
Title: indoc
Author: Graham Nelson
Purpose: A Swiss army knife to produce documentation
Purpose: The documentation-formatter for the Inform 7 system.
Language: InC
Declare Section Usage: Off
Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 4
Version Name: Didache
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
@ -161,5 +161,6 @@ Chapter 4: Book Designs

2
indoc/versions.txt
View file

@ -2,4 +2,4 @@ Sync to inform7
Aquinas 1 3K27 April 2006 First Perl version
Bonaventure 2 5Z71 April 2009 Tidied up somewhat
Cranmer 3 6L02 May 2014 EPUB ebook generation support
Didache 4 *6Q15 8 February 2019 Ported to C with Unicode support
Didache 4 *6Q16 10 February 2019 Ported to C with Unicode support

2
inform6/inform6.mk
View file

@ -7,7 +7,7 @@ INWEB = inweb/Tangled/inweb
CC = clang -std=c99 -c $(MANYWARNINGS) $(CCOPTS) -g
INDULGENTCC = clang -std=c99 -c $(FEWERWARNINGS) $(CCOPTS) -g
CCOPTS = -DPLATFORM_MACOS=1 -mmacosx-version-min=10.4 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.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 -ferror-limit=1000

5
inform7/Contents.w
View file

@ -1,7 +1,7 @@
Title: inform7
Author: Graham Nelson
Build Date: 8 February 2019
Build Number: 6Q15
Build Date: 10 February 2019
Build Number: 6Q16
Version Name: Krypton
Version Number: 7.10.1
Purpose: The core compiler in a natural-language design system for interactive fiction.
@ -290,5 +290,6 @@ followed during compilation."

2
inform7/core-module/Chapter 6/New Verbs.w
View file

@ -703,7 +703,7 @@ void NewVerbs::ConjugateVerb_invoke_emit(verb_conjugation *vc,
=
int NewVerbs::verb_form_is_instance(verb_form *vf) {
verb_conjugation *vc = vf->underlying_verb->conjugation;
if ((vc->auxiliary_only == FALSE) && (vc->instance_of_verb) &&
if ((vc) && (vc->auxiliary_only == FALSE) && (vc->instance_of_verb) &&
((vf->preposition == NULL) || (vf->underlying_verb != copular_verb)))
return TRUE;
return FALSE;

5
inform7/inflections-test/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Abacus
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: words
@ -149,5 +149,6 @@ Chapter 1: Everything

2
inform7/inflections-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q15 8 February 2019
Abacus 1 *6Q16 10 February 2019

5
inform7/kinds-test/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Abacus
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: words
@ -139,5 +139,6 @@ Chapter 1: Everything

2
inform7/kinds-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q15 8 February 2019
Abacus 1 *6Q16 10 February 2019

4
inform7/linguistics-module/Chapter 4/Verb Usages.w
View file

@ -550,7 +550,7 @@ or "the verb to be able to see" use these.
verb_form *vf;
LOOP_OVER(vf, verb_form) {
verb_conjugation *vc = vf->underlying_verb->conjugation;
if ((vc->auxiliary_only == FALSE) && (vc->instance_of_verb)) {
if ((vc) && (vc->auxiliary_only == FALSE) && (vc->instance_of_verb)) {
if (WordAssemblages::compare_with_wording(&(vf->pos_reference_text), W)) {
*XP = vf; *X = FALSE; return TRUE;
}
@ -566,7 +566,7 @@ or "the verb to be able to see" use these.
verb_form *vf;
LOOP_OVER(vf, verb_form) {
verb_conjugation *vc = vf->underlying_verb->conjugation;
if ((vc->auxiliary_only == FALSE) && (vc->instance_of_verb)) {
if ((vc) && (vc->auxiliary_only == FALSE) && (vc->instance_of_verb)) {
if (WordAssemblages::compare_with_wording(&(vf->infinitive_reference_text), W)) {
*XP = vf; *X = FALSE; return TRUE;
}

5
inform7/linguistics-test/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Abacus
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: words
@ -158,5 +158,6 @@ Chapter 1: Everything

2
inform7/linguistics-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q15 8 February 2019
Abacus 1 *6Q16 10 February 2019

5
inform7/problems-test/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Abacus
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: words
@ -120,5 +120,6 @@ Chapter 1: Everything

2
inform7/problems-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q15 8 February 2019
Abacus 1 *6Q16 10 February 2019

2
inform7/syntax-module/Chapter 2/Parse Tree.w
View file

@ -197,7 +197,7 @@ parse_tree_node_type parse_tree_node_types[NO_DEFINED_NT_VALUES];
void ParseTree::md(parse_tree_node_type ptnt) {
if (ParseTree::valid_type(ptnt.identity) == FALSE) internal_error("set bad metadata");
parse_tree_node_types[ptnt.identity] = ptnt;
parse_tree_node_types[ptnt.identity - BASE_OF_ENUMERATED_NTS] = ptnt;
}
@ =

5
inform7/syntax-test/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Abacus
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: words
@ -143,5 +143,6 @@ Chapter 1: Everything

2
inform7/syntax-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q15 8 February 2019
Abacus 1 *6Q16 10 February 2019

2
inform7/versions.txt
View file

@ -28,4 +28,4 @@ Hydrogen 7.8.1 6E59 June 2010 Parchment support, functional programming
Iron 7.9.1 6L02 May 2014 Language reforms, unifying text
7.9.2 6L38 August 2014 Added Android platform
7.9.3 6M62 December 2015 Extension projects, unifying actions
Krypton 7.10.1 *6Q15 8 February 2019 *
Krypton 7.10.1 *6Q16 10 February 2019 *

2
inform7/words-module/Chapter 3/Lexer.w
View file

@ -281,7 +281,7 @@ void Lexer::ensure_lexer_hwm_can_be_raised_by(int n, int transfer_partial_word)
wchar_t *old_hwm = lexer_hwm;
int m = 1;
if (transfer_partial_word) {
m = ((old_hwm - lexer_word + n + 3)/TEXT_STORAGE_CHUNK_SIZE) + 1;
m = (((int) (old_hwm - lexer_word) + n + 3)/TEXT_STORAGE_CHUNK_SIZE) + 1;
if (m < 1) m = 1;
}
Lexer::allocate_lexer_workspace_chunk(m);

5
inform7/words-test/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Abacus
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: words
@ -135,5 +135,6 @@ Chapter 1: Everything

2
inform7/words-test/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Abacus 1 *6Q15 8 February 2019
Abacus 1 *6Q16 10 February 2019

5
inrtps/Contents.w
View file

@ -6,8 +6,8 @@ Declare Section Usage: Off
Licence: Artistic License 2.0
Version Number: 2
Version Name: Benefactive
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Web Syntax Version: 2
Import: foundation
@ -138,5 +138,6 @@ Chapter 1: The Whole Shooting Match

2
inrtps/versions.txt
View file

@ -1,3 +1,3 @@
Sync to inform7
Ablative 1 3K27 April 2006 First Perl version
Benefactive 2 *6Q15 8 February 2019 Ported to C with Unicode support
Benefactive 2 *6Q16 10 February 2019 Ported to C with Unicode support

5
inter/Contents.w
View file

@ -7,8 +7,8 @@ Web Syntax Version: 2
Licence: Artistic License 2.0
Version Number: 1
Version Name: Axion
Build Number: 6Q15
Build Date: 8 February 2019
Build Number: 6Q16
Build Date: 10 February 2019
Import: foundation
Import: inter
@ -165,5 +165,6 @@ Chapter 1: Everything

2
inter/versions.txt
View file

@ -1,2 +1,2 @@
Sync to inform7
Axion 1 *6Q15 8 February 2019
Axion 1 *6Q16 10 February 2019

1
makescript.txt
View file

@ -344,6 +344,7 @@ endef
.PHONY: pages
pages:
$(INWEBX) inblorb -weave-docs -weave-into docs/inblorb
$(INWEBX) indoc -weave-docs -weave-into docs/indoc
# -----------------------------------------------------------------------------
# Target "clean"