From 8760c1ba6442153afe76bcac742e086f90c59fe8 Mon Sep 17 00:00:00 2001 From: Jason Self Date: Thu, 24 Dec 2020 20:07:13 -0800 Subject: [PATCH] Update to commit e2647ad952b4d7afc9a186429c181efbc4958786 Dated December 11 2020. These changes are similiarly relicensed to GPL per Section 4(c)(ii) of the Artistic License 2.0. --- .gitignore | 17 +- COPYING | 8 +- DebugFileFormat.txt | 2 +- INSTALL | 369 -------------------------------------------- Makefile.am | 16 -- configure.ac | 40 ----- readme.txt | 44 +++--- src/Makefile.am | 17 -- src/arrays.c | 25 ++- src/asm.c | 11 +- src/bpatch.c | 5 +- src/chars.c | 5 +- src/directs.c | 62 +++++--- src/errors.c | 52 ++++++- src/expressc.c | 5 +- src/expressp.c | 5 +- src/files.c | 5 +- src/header.h | 11 +- src/inform.c | 9 +- src/lexer.c | 7 +- src/linker.c | 7 +- src/memory.c | 7 +- src/objects.c | 55 ++++--- src/states.c | 7 +- src/symbols.c | 7 +- src/syntax.c | 31 ++-- src/tables.c | 7 +- src/text.c | 11 +- src/veneer.c | 7 +- src/verbs.c | 9 +- version.sh | 17 -- 31 files changed, 241 insertions(+), 639 deletions(-) delete mode 100644 INSTALL delete mode 100644 Makefile.am delete mode 100644 configure.ac delete mode 100644 src/Makefile.am delete mode 100755 version.sh diff --git a/.gitignore b/.gitignore index 07c7a21..824607f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1 @@ -/Makefile -/Makefile.in -/aclocal.m4 -/autom4te.cache/ -/compile -/config.log -/config.status -/configure -/depcomp -/install-sh -/missing -/src/*.o -/src/.deps -/src/Makefile -/src/Makefile.in -/src/inform \ No newline at end of file +inform \ No newline at end of file diff --git a/COPYING b/COPYING index 94a9ed0..f288702 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff --git a/DebugFileFormat.txt b/DebugFileFormat.txt index 9850bbf..fceef6c 100644 --- a/DebugFileFormat.txt +++ b/DebugFileFormat.txt @@ -398,4 +398,4 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Inform. If not, see https://gnu.org/licenses/ +along with Inform. If not, see https://gnu.org/licenses/ \ No newline at end of file diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 608c201..0000000 --- a/INSTALL +++ /dev/null @@ -1,369 +0,0 @@ -Installation Instructions -************************* - - Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software -Foundation, Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, after you have run autoreconf --install, the shell -command './configure && make && make install' should configure, build, -and install this package. The following more-detailed instructions -are generic; see the 'README' file for instructions specific to this -package. Some packages provide this 'INSTALL' file but do not -implement all of the features documented below. The lack of an -optional feature in a given package is not necessarily a bug. More -recommendations for GNU packages can be found in *note Makefile -Conventions: (standards)Makefile Conventions. - - The 'configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a 'Makefile' in each directory of the package. -It may also create one or more '.h' files containing system-dependent -definitions. Finally, it creates a shell script 'config.status' that -you can run in the future to recreate the current configuration, and a -file 'config.log' containing compiler output (useful mainly for -debugging 'configure'). - - It can also use an optional file (typically called 'config.cache' and -enabled with '--cache-file=config.cache' or simply '-C') that saves the -results of its tests to speed up reconfiguring. Caching is disabled by -default to prevent problems with accidental use of stale cache files. - - If you need to do unusual things to compile the package, please try -to figure out how 'configure' could check whether to do them, and mail -diffs or instructions to the address given in the 'README' so they can -be considered for the next release. If you are using the cache, and at -some point 'config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file 'configure.ac' (or 'configure.in') is used to create -'configure' by a program called 'autoconf'. You need 'configure.ac' if -you want to change it or regenerate 'configure' using a newer version of -'autoconf'. - - The simplest way to compile this package is: - - 1. 'cd' to the directory containing the package's source code and type - './configure' to configure the package for your system. - - Running 'configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type 'make' to compile the package. - - 3. Optionally, type 'make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type 'make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the 'make install' phase executed with root - privileges. - - 5. Optionally, type 'make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior 'make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing 'make clean'. To also remove the - files that 'configure' created (so you can compile the package for - a different kind of computer), type 'make distclean'. There is - also a 'make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type 'make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide 'make - distcheck', which can by used by developers to test that all other - targets like 'make install' and 'make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the 'configure' script does not know about. Run './configure --help' -for details on some of the pertinent environment variables. - - You can give 'configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here is -an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU 'make'. 'cd' to the -directory where you want the object files and executables to go and run -the 'configure' script. 'configure' automatically checks for the source -code in the directory that 'configure' is in and in '..'. This is known -as a "VPATH" build. - - With a non-GNU 'make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use 'make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple '-arch' options to the -compiler but only a single '-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the 'lipo' tool if you have problems. - -Installation Names -================== - - By default, 'make install' installs the package's commands under -'/usr/local/bin', include files under '/usr/local/include', etc. You -can specify an installation prefix other than '/usr/local' by giving -'configure' the option '--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option '--exec-prefix=PREFIX' to 'configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like '--bindir=DIR' to specify different values for particular -kinds of files. Run 'configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the default -for these options is expressed in terms of '${prefix}', so that -specifying just '--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to 'configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -'make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, 'make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -'${prefix}'. Any directories that were specified during 'configure', -but not in terms of '${prefix}', must each be overridden at install time -for the entire installation to be relocated. The approach of makefile -variable overrides for each directory variable is required by the GNU -Coding Standards, and ideally causes no recompilation. However, some -platforms have known limitations with the semantics of shared libraries -that end up requiring recompilation when using this method, particularly -noticeable in packages that use GNU Libtool. - - The second method involves providing the 'DESTDIR' variable. For -example, 'make install DESTDIR=/alternate/directory' will prepend -'/alternate/directory' before all installation names. The approach of -'DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of '${prefix}' -at 'configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving 'configure' the -option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - - Some packages pay attention to '--enable-FEATURE' options to -'configure', where FEATURE indicates an optional part of the package. -They may also pay attention to '--with-PACKAGE' options, where PACKAGE -is something like 'gnu-as' or 'x' (for the X Window System). The -'README' should mention any '--enable-' and '--with-' options that the -package recognizes. - - For packages that use the X Window System, 'configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the 'configure' options '--x-includes=DIR' and -'--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of 'make' will be. For these packages, running './configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with 'make V=1'; while running './configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with 'make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC -is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX 'make' updates targets which have the same time stamps as their -prerequisites, which makes it generally unusable when shipped generated -files such as 'configure' are involved. Use GNU 'make' instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its '' header file. The option '-nodtk' can be used as a -workaround. If GNU CC is not installed, it is therefore recommended to -try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put '/usr/ucb' early in your 'PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in '/usr/bin'. So, if you need '/usr/ucb' -in your 'PATH', put it _after_ '/usr/bin'. - - On Haiku, software installed for all users goes in '/boot/common', -not '/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features 'configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, 'configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -'--build=TYPE' option. TYPE can either be a short name for the system -type, such as 'sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file 'config.sub' for the possible values of each field. If -'config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option '--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with '--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for 'configure' scripts to share, -you can create a site shell script called 'config.site' that gives -default values for variables like 'CC', 'cache_file', and 'prefix'. -'configure' looks for 'PREFIX/share/config.site' if it exists, then -'PREFIX/etc/config.site' if it exists. Or, you can set the -'CONFIG_SITE' environment variable to the location of the site script. -A warning: not all 'configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to 'configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the 'configure' command line, using 'VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified 'gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an -Autoconf limitation. Until the limitation is lifted, you can use this -workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -'configure' Invocation -====================== - - 'configure' recognizes the following options to control how it -operates. - -'--help' -'-h' - Print a summary of all of the options to 'configure', and exit. - -'--help=short' -'--help=recursive' - Print a summary of the options unique to this package's - 'configure', and exit. The 'short' variant lists options used only - in the top level, while the 'recursive' variant lists options also - present in any nested packages. - -'--version' -'-V' - Print the version of Autoconf used to generate the 'configure' - script, and exit. - -'--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally 'config.cache'. FILE defaults to '/dev/null' to - disable caching. - -'--config-cache' -'-C' - Alias for '--cache-file=config.cache'. - -'--quiet' -'--silent' -'-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to '/dev/null' (any error - messages will still be shown). - -'--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - 'configure' can determine that directory automatically. - -'--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: for - more details, including other options available for fine-tuning the - installation locations. - -'--no-create' -'-n' - Run the configure checks, but stop before creating any output - files. - -'configure' also accepts some other, not widely useful, options. Run -'configure --help' for more details. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index b73d721..0000000 --- a/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -# This file is part of Inform. -# -# Inform is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# theFree Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -# Inform is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Inform. If not, see https://gnu.org/licenses/ - -SUBDIRS = src \ No newline at end of file diff --git a/configure.ac b/configure.ac deleted file mode 100644 index a502cfc..0000000 --- a/configure.ac +++ /dev/null @@ -1,40 +0,0 @@ -# Process this file with autoconf to produce a configure script. -# -# This file is part of Inform. -# -# Inform is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# theFree Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -# Inform is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Inform. If not, see https://gnu.org/licenses/ - -AC_INIT([inform], m4_esyscmd_s([./version.sh]), [j@jxself.org], [], [https://jxself.org/git/?p=inform.git]) -AM_INIT_AUTOMAKE([foreign]) -AC_OUTPUT(Makefile src/Makefile) - -# Checks for programs. -AC_PROG_CC - -# Checks for libraries. - -# Checks for header files. -AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_CHECK_HEADER_STDBOOL -AC_TYPE_SIZE_T - -# Checks for library functions. -AC_FUNC_ERROR_AT_LINE -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([memmove memset realpath strchr strtol]) - -AC_OUTPUT diff --git a/readme.txt b/readme.txt index 63ce6df..12559d7 100644 --- a/readme.txt +++ b/readme.txt @@ -1,41 +1,39 @@ -This is the Inform compiler. It has been modified slightly to work -better when the Inform standard library is in a non-standard -location. +This is the Inform compiler. It has been modified slightly to work +better when the Inform standard library is in a non-standard +location and to make it compatible with the GNU FSDG. -Compiling Inform is very easy. You'll need a compiler (like GCC), -along with the GNU Autotools and GNU Make. +Compiling Inform is very easy. Install GCC and then: -First run autoreconf --install; then see the INSTALL file for -installation information. +gcc src/*.c -o inform -Inform 6 is published under the original Inform licence (which is +Inform 6 is published under the original Inform licence (which is proprietary), or under the Artistic License 2.0, at the user's choice. -When getting a copy of the software I selected that my copy would be +When getting a copy of the software I selected that my copy would be under the Artistic License 2.0. -Once I had a copy of the software under that license I invoked the -Artistic License's "relicensing" clause in Section 4(c)(ii) to -relicense under the GNU General Public License. This copy of Inform is +Once I had a copy of the software under that license I invoked the +Artistic License's "relicensing" clause in Section 4(c)(ii) to +relicense under the GNU General Public License. This copy of Inform is now licensed in that way. -Based on -https://web.archive.org/web/20160326074115/http://www.perlfoundation.org/artistic_2_0_notes -from the Perl Software Foundation, who wrote both the Artistic License +Based on +https://web.archive.org/web/20160326074115/http://www.perlfoundation.org/artistic_2_0_notes +from the Perl Software Foundation, who wrote both the Artistic License 1.0 and 2.0, the GPL qualifies under 4(c)(ii). -- This file is part of Inform. - -Inform is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation, either version 3 of the License, or (at your + +Inform is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation, either version 3 of the License, or (at your option) any later version. -Inform is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +Inform is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License +You should have received a copy of the GNU General Public License along with Inform. If not, see https://gnu.org/licenses/ diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 975223d..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of Inform. -# -# Inform is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# theFree Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -# Inform is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Inform. If not, see https://gnu.org/licenses/ - -bin_PROGRAMS = inform -inform_SOURCES = arrays.c asm.c bpatch.c chars.c directs.c errors.c expressc.c expressp.c files.c header.h inform.c lexer.c linker.c memory.c objects.c states.c symbols.c syntax.c tables.c text.c veneer.c verbs.c \ No newline at end of file diff --git a/src/arrays.c b/src/arrays.c index fc4f7af..c1f410c 100644 --- a/src/arrays.c +++ b/src/arrays.c @@ -3,9 +3,8 @@ /* likewise global variables, which are in some ways a */ /* simpler form of the same thing. */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -95,6 +94,10 @@ extern void finish_array(int32 i, int is_static) area = static_array_area; area_size = static_array_area_size; } + + if (i == 0) { + error("An array must have at least one entry"); + } /* Write the array size into the 0th byte/word of the array, if it's a "table" or "string" array */ @@ -259,7 +262,7 @@ extern void array_entry(int32 i, int is_static, assembly_operand VAL) /* */ /* | -> | */ /* | --> | ... */ -/* | string | [ [,] [;] ... ]; */ +/* | string | [ [;] ... ]; */ /* | table */ /* | buffer */ /* */ @@ -311,7 +314,7 @@ extern void make_global(int array_flag, int name_only) goto RedefinitionOfSystemVar; } - if ((token_type != SYMBOL_TT) || (!(sflags[i] & UNKNOWN_SFLAG))) + if (token_type != SYMBOL_TT) { discard_token_location(beginning_debug_location); if (array_flag) ebf_error("new array name", token_text); @@ -319,6 +322,14 @@ extern void make_global(int array_flag, int name_only) panic_mode_error_recovery(); return; } + if (!(sflags[i] & UNKNOWN_SFLAG)) + { discard_token_location(beginning_debug_location); + if (array_flag) + ebf_symbol_error("new array name", token_text, typename(stypes[i]), slines[i]); + else ebf_symbol_error("new global variable name", token_text, typename(stypes[i]), slines[i]); + panic_mode_error_recovery(); return; + } + if ((!array_flag) && (sflags[i] & USED_SFLAG)) error_named("Variable must be defined before use:", token_text); @@ -544,8 +555,8 @@ extern void make_global(int array_flag, int name_only) CalculatedArraySize: - if (module_switch && (AO.marker != 0)) - { error("Array sizes must be known now, not externally defined"); + if (AO.marker != 0) + { error("Array sizes must be known now, not defined later"); break; } diff --git a/src/asm.c b/src/asm.c index 3467100..e8a20fe 100644 --- a/src/asm.c +++ b/src/asm.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "asm" : The Inform assembler */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -2078,13 +2077,13 @@ static void transfer_routine_g(void) ((form_len == 2) ? "short" : "long"))); } if (form_len == 1) { - if (addr < -0x80 && addr >= 0x80) { + if (addr < -0x80 || addr >= 0x80) { error("*** Label out of range for byte branch ***"); } - zcode_holding_area[i] = (addr) & 0xFF; + zcode_holding_area[i] = (addr) & 0xFF; } else if (form_len == 2) { - if (addr < -0x8000 && addr >= 0x8000) { + if (addr < -0x8000 || addr >= 0x8000) { error("*** Label out of range for short branch ***"); } zcode_holding_area[i] = (addr >> 8) & 0xFF; diff --git a/src/bpatch.c b/src/bpatch.c index 43078d2..4e6aa4b 100644 --- a/src/bpatch.c +++ b/src/bpatch.c @@ -2,9 +2,8 @@ /* "bpatch" : Keeps track of, and finally acts on, backpatch markers, */ /* correcting symbol values not known at compilation time */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ diff --git a/src/chars.c b/src/chars.c index 701d14e..9bd257a 100644 --- a/src/chars.c +++ b/src/chars.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "chars" : Character set mappings and the Z-machine alphabet table */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ diff --git a/src/directs.c b/src/directs.c index 2fbc40b..fc725a0 100644 --- a/src/directs.c +++ b/src/directs.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "directs" : Directives (# commands) */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -52,6 +51,14 @@ static int ebf_error_recover(char *s1, char *s2) return FALSE; } +static int ebf_symbol_error_recover(char *s1, char *name, char *type, brief_location report_line) +{ + /* Same for ebf_symbol_error(). */ + ebf_symbol_error(s1, name, type, report_line); + panic_mode_error_recovery(); + return FALSE; +} + /* ------------------------------------------------------------------------- */ extern int parse_given_directive(int internal_flag) @@ -65,6 +72,26 @@ extern int parse_given_directive(int internal_flag) const char *constant_name; debug_location_beginning beginning_debug_location; + if (internal_flag) + { + /* Only certain directives, such as #ifdef, are permitted within + a routine or object definition. In older versions of Inform, + nearly any directive was accepted, but this was -- to quote + an old code comment -- "about as well-supported as Wile E. + Coyote one beat before the plummet-lines kick in." */ + + if (token_value != IFV3_CODE && token_value != IFV5_CODE + && token_value != IFDEF_CODE && token_value != IFNDEF_CODE + && token_value != IFTRUE_CODE && token_value != IFFALSE_CODE + && token_value != IFNOT_CODE && token_value != ENDIF_CODE + && token_value != MESSAGE_CODE && token_value != ORIGSOURCE_CODE + && token_value != TRACE_CODE) { + char *dirname = directives.keywords[token_value]; + error_named("Cannot nest this directive inside a routine or object:", dirname); + panic_mode_error_recovery(); return FALSE; + } + } + switch(token_value) { @@ -124,10 +151,6 @@ extern int parse_given_directive(int internal_flag) /* --------------------------------------------------------------------- */ case CLASS_CODE: - if (internal_flag) - { error("Cannot nest #Class inside a routine or object"); - panic_mode_error_recovery(); return FALSE; - } make_class(NULL); /* See "objects.c" */ return FALSE; @@ -142,12 +165,16 @@ extern int parse_given_directive(int internal_flag) get_next_token(); i = token_value; beginning_debug_location = get_token_location_beginning(); - if ((token_type != SYMBOL_TT) - || (!(sflags[i] & (UNKNOWN_SFLAG + REDEFINABLE_SFLAG)))) + if (token_type != SYMBOL_TT) { discard_token_location(beginning_debug_location); return ebf_error_recover("new constant name", token_text); } + if (!(sflags[i] & (UNKNOWN_SFLAG + REDEFINABLE_SFLAG))) + { discard_token_location(beginning_debug_location); + return ebf_symbol_error_recover("new constant name", token_text, typename(stypes[i]), slines[i]); + } + assign_symbol(i, 0, CONSTANT_T); constant_name = token_text; @@ -582,8 +609,10 @@ Fake_Action directives to a point after the inclusion of \"Parser\".)"); panic_mode_error_recovery(); return FALSE; } get_next_token(); i = token_value; - if ((token_type != SYMBOL_TT) || (!(sflags[i] & UNKNOWN_SFLAG))) + if (token_type != SYMBOL_TT) return ebf_error_recover("new low string name", token_text); + if (!(sflags[i] & UNKNOWN_SFLAG)) + return ebf_symbol_error_recover("new low string name", token_text, typename(stypes[i]), slines[i]); get_next_token(); if (token_type != DQ_TT) @@ -645,10 +674,6 @@ Fake_Action directives to a point after the inclusion of \"Parser\".)"); /* --------------------------------------------------------------------- */ case NEARBY_CODE: - if (internal_flag) - { error("Cannot nest #Nearby inside a routine or object"); - panic_mode_error_recovery(); return FALSE; - } make_object(TRUE, NULL, -1, -1, -1); return FALSE; /* See "objects.c" */ @@ -657,10 +682,6 @@ Fake_Action directives to a point after the inclusion of \"Parser\".)"); /* --------------------------------------------------------------------- */ case OBJECT_CODE: - if (internal_flag) - { error("Cannot nest #Object inside a routine or object"); - panic_mode_error_recovery(); return FALSE; - } make_object(FALSE, NULL, -1, -1, -1); return FALSE; /* See "objects.c" */ @@ -851,11 +872,6 @@ Fake_Action directives to a point after the inclusion of \"Parser\".)"); /* --------------------------------------------------------------------- */ case STUB_CODE: - if (internal_flag) - { error("Cannot nest #Stub inside a routine or object"); - panic_mode_error_recovery(); return FALSE; - } - /* The upcoming symbol is a definition; don't count it as a top-level reference *to* the stub function. */ df_dont_note_global_symbols = TRUE; diff --git a/src/errors.c b/src/errors.c index d130398..c1e6241 100644 --- a/src/errors.c +++ b/src/errors.c @@ -2,9 +2,8 @@ /* "errors" : Warnings, errors and fatal errors */ /* (with error throwback code for RISC OS machines) */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -32,6 +31,8 @@ static char error_message_buff[ERROR_BUFLEN+4]; /* room for ellipsis */ ErrorPosition ErrorReport; /* Maintained by "lexer.c" */ +static char other_pos_buff[ERROR_BUFLEN+1]; /* Used by location_text() */ + static void print_preamble(void) { /* Only really prints the preamble to an error or warning message: @@ -90,6 +91,42 @@ static void print_preamble(void) } } +static char *location_text(brief_location report_line) +{ + /* Convert the location to a brief string. + (Some error messages need to report a secondary location.) + This uses the static buffer other_pos_buff. */ + + ErrorPosition errpos; + errpos.file_number = -1; + errpos.source = NULL; + errpos.line_number = 0; + errpos.main_flag = 0; + errpos.orig_source = NULL; + export_brief_location(report_line, &errpos); + + int j; + char *p; + + j = errpos.file_number; + if (j <= 0 || j > total_files) p = errpos.source; + else p = InputFiles[j-1].filename; + + if (!p) p = ""; + + int len = 0; + + if (!(errpos.main_flag)) { + snprintf(other_pos_buff+len, ERROR_BUFLEN-len, + "\"%s\", ", p); + len = strlen(other_pos_buff); + } + snprintf(other_pos_buff+len, ERROR_BUFLEN-len, + "line %d", errpos.line_number); + + return other_pos_buff; +} + static void ellipsize_error_message_buff(void) { /* If the error buffer was actually filled up by a message, it was @@ -255,6 +292,12 @@ extern void ebf_error(char *s1, char *s2) error(error_message_buff); } +extern void ebf_symbol_error(char *s1, char *name, char *type, brief_location report_line) +{ snprintf(error_message_buff, ERROR_BUFLEN, "\"%s\" is a name already in use and may not be used as a %s (%s \"%s\" was defined at %s)", name, s1, type, name, location_text(report_line)); + ellipsize_error_message_buff(); + error(error_message_buff); +} + extern void char_error(char *s, int ch) { int32 uni; @@ -402,8 +445,7 @@ Check to see if there is a more recent version available, from which\n\ the problem may have been removed. If not, please report this fault\n\ and if at all possible, please include your source code, as faults\n\ such as these are rare and often difficult to reproduce. Sorry.\n\ -***********************************************************************\n", - (RELEASE_NUMBER/100)%10, RELEASE_NUMBER%100, RELEASE_DATE); +***********************************************************************\n"); } extern int compiler_error(char *s) diff --git a/src/expressc.c b/src/expressc.c index 876804b..3b5fe6a 100644 --- a/src/expressc.c +++ b/src/expressc.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "expressc" : The expression code generator */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ diff --git a/src/expressp.c b/src/expressp.c index c5f79bc..ce063c2 100644 --- a/src/expressp.c +++ b/src/expressp.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "expressp" : The expression parser */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ diff --git a/src/files.c b/src/files.c index 742e965..c465139 100644 --- a/src/files.c +++ b/src/files.c @@ -7,9 +7,8 @@ /* routines in "inform.c", since they are tied up with ICL */ /* settings and are very host OS-dependent. */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ diff --git a/src/header.h b/src/header.h index 5b40c6b..652a0c8 100644 --- a/src/header.h +++ b/src/header.h @@ -1,7 +1,10 @@ /* ------------------------------------------------------------------------- */ /* Header file for Inform: Z-machine ("Infocom" format) compiler */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ +/* Inform 6.35 */ +/* */ +/* This header file and the others making up the Inform source code are */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* This file is part of Inform. */ /* */ @@ -18,6 +21,9 @@ /* You should have received a copy of the GNU General Public License */ /* along with Inform. If not, see https://gnu.org/licenses/ */ /* */ +/* For detailed documentation on how this program internally works, and */ +/* how to port it to a new environment, see the Technical Manual. */ +/* */ /* *** To compile this program in one of the existing ports, you must */ /* at least change the machine definition (on the next page). */ /* In most cases no other work will be needed. *** */ @@ -33,7 +39,7 @@ /* ------------------------------------------------------------------------- */ /* For releases, set to the release date in the form "1st January 2000" */ -#define RELEASE_DATE "15 August 2020" +#define RELEASE_DATE "in development" #define RELEASE_NUMBER 1635 #define GLULX_RELEASE_NUMBER 38 #define MODULE_VERSION_NUMBER 1 @@ -2278,6 +2284,7 @@ extern void error_named(char *s1, char *s2); extern void error_numbered(char *s1, int val); extern void error_named_at(char *s1, char *s2, brief_location report_line); extern void ebf_error(char *s1, char *s2); +extern void ebf_symbol_error(char *s1, char *name, char *type, brief_location report_line); extern void char_error(char *s, int ch); extern void unicode_char_error(char *s, int32 uni); extern void no_such_label(char *lname); diff --git a/src/inform.c b/src/inform.c index b3396a3..93bfcc7 100644 --- a/src/inform.c +++ b/src/inform.c @@ -2,9 +2,8 @@ /* "inform" : The top level of Inform: switches, pathnames, filenaming */ /* conventions, ICL (Inform Command Line) files, main */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -17,7 +16,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ @@ -1293,7 +1292,7 @@ One or more words can be supplied as \"commands\". These may be:\n\n\ --config filename (setup file)\n\n"); #ifndef PROMPT_INPUT - printf("For example: \"inform -dexs $huge curses\".\n\n"); + printf("For example: \"inform -dexs $huge curses\".\n"); #endif return; diff --git a/src/lexer.c b/src/lexer.c index e136994..b741ff0 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "lexer" : Lexical analyser */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -16,7 +15,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/linker.c b/src/linker.c index 4966a68..ab9dabe 100644 --- a/src/linker.c +++ b/src/linker.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "linker" : For compiling and linking modules */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -16,7 +15,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/memory.c b/src/memory.c index 21dcf57..9b4a669 100644 --- a/src/memory.c +++ b/src/memory.c @@ -2,9 +2,8 @@ /* "memory" : Memory management and ICL memory setting commands */ /* (For "memoryerror", see "errors.c") */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -17,7 +16,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/objects.c b/src/objects.c index 8dad7c3..9d54ec2 100644 --- a/src/objects.c +++ b/src/objects.c @@ -6,9 +6,8 @@ /* checks syntax and translates such directives into */ /* specifications for the object-maker. */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -21,7 +20,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ @@ -135,13 +134,20 @@ more than", get_next_token(); i = token_value; name = token_text; - if ((token_type != SYMBOL_TT) || (!(sflags[i] & UNKNOWN_SFLAG))) + if (token_type != SYMBOL_TT) { discard_token_location(beginning_debug_location); ebf_error("new attribute name", token_text); panic_mode_error_recovery(); put_token_back(); return; } + if (!(sflags[i] & UNKNOWN_SFLAG)) + { discard_token_location(beginning_debug_location); + ebf_symbol_error("new attribute name", token_text, typename(stypes[i]), slines[i]); + panic_mode_error_recovery(); + put_token_back(); + return; + } directive_keywords.enabled = TRUE; get_next_token(); @@ -226,13 +232,20 @@ Advanced game to get an extra 62)"); get_next_token(); i = token_value; name = token_text; - if ((token_type != SYMBOL_TT) || (!(sflags[i] & UNKNOWN_SFLAG))) + if (token_type != SYMBOL_TT) { discard_token_location(beginning_debug_location); ebf_error("new property name", token_text); panic_mode_error_recovery(); put_token_back(); return; } + if (!(sflags[i] & UNKNOWN_SFLAG)) + { discard_token_location(beginning_debug_location); + ebf_symbol_error("new property name", token_text, typename(stypes[i]), slines[i]); + panic_mode_error_recovery(); + put_token_back(); + return; + } directive_keywords.enabled = TRUE; get_next_token(); @@ -1081,12 +1094,7 @@ static void properties_segment_z(int this_segment) { if (stypes[token_value]==INDIVIDUAL_PROPERTY_T) this_identifier_number = svals[token_value]; else - { char already_error[128]; - sprintf(already_error, - "\"%s\" is a name already in use (with type %s) \ -and may not be used as a property name too", - token_text, typename(stypes[token_value])); - error(already_error); + { ebf_symbol_error("property name", token_text, typename(stypes[token_value]), slines[token_value]); return; } } @@ -1350,12 +1358,7 @@ static void properties_segment_g(int this_segment) { if (stypes[token_value]==INDIVIDUAL_PROPERTY_T) this_identifier_number = svals[token_value]; else - { char already_error[128]; - sprintf(already_error, - "\"%s\" is a name already in use (with type %s) \ -and may not be used as a property name too", - token_text, typename(stypes[token_value])); - error(already_error); + { ebf_symbol_error("property name", token_text, typename(stypes[token_value]), slines[token_value]); return; } } @@ -1776,13 +1779,18 @@ inconvenience, please contact the maintainers."); } else { get_next_token(); - if ((token_type != SYMBOL_TT) - || (!(sflags[token_value] & UNKNOWN_SFLAG))) + if (token_type != SYMBOL_TT) { discard_token_location(beginning_debug_location); ebf_error("new class name", token_text); panic_mode_error_recovery(); return; } + if (!(sflags[token_value] & UNKNOWN_SFLAG)) + { discard_token_location(beginning_debug_location); + ebf_symbol_error("new class name", token_text, typename(stypes[token_value]), slines[token_value]); + panic_mode_error_recovery(); + return; + } } /* Each class also creates a modest object representing itself: */ @@ -1976,10 +1984,13 @@ extern void make_object(int nearby_flag, if (token_type == DQ_TT) textual_name = token_text; else - { if ((token_type != SYMBOL_TT) - || (!(sflags[token_value] & UNKNOWN_SFLAG))) + { if (token_type != SYMBOL_TT) { ebf_error("name for new object or its textual short name", token_text); + } + else if (!(sflags[token_value] & UNKNOWN_SFLAG)) { + ebf_symbol_error("new object", token_text, typename(stypes[token_value]), slines[token_value]); + } else { internal_name_symbol = token_value; strcpy(internal_name, token_text); diff --git a/src/states.c b/src/states.c index 5fe55b3..8feb6a7 100644 --- a/src/states.c +++ b/src/states.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "states" : Statement translator */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -16,7 +15,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/symbols.c b/src/symbols.c index 91d5f2e..d2f42da 100644 --- a/src/symbols.c +++ b/src/symbols.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "symbols" : The symbols table; creating stock of reserved words */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -16,7 +15,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/syntax.c b/src/syntax.c index 0896af9..08e61c9 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "syntax" : Syntax analyser and compiler */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -16,7 +15,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ @@ -85,13 +84,7 @@ extern void get_next_token_with_directives(void) This is called while parsing a long construct, such as Class or Object, where we want to support internal #ifdefs. (Although - function-parsing predates this and doesn't make use of it.) - - (Technically this permits *any* #-directive, which means you - can define global variables or properties or what-have-you in - the middle of an object. You can do that in the middle of an - object, too. Don't. It's about as well-supported as Wile E. - Coyote one beat before the plummet-lines kick in.) */ + function-parsing predates this and doesn't make use of it.) */ int directives_save, segment_markers_save, statements_save; @@ -157,6 +150,8 @@ extern int parse_directive(int internal_flag) TRUE if encountered with a # prefix inside a routine or object definition. + (Only directives like #ifdef are permitted inside a definition.) + Returns: TRUE if program continues, FALSE if end of file reached. */ int routine_symbol, rep_symbol; @@ -185,12 +180,15 @@ extern int parse_directive(int internal_flag) df_dont_note_global_symbols = TRUE; get_next_token(); df_dont_note_global_symbols = FALSE; - if ((token_type != SYMBOL_TT) - || ((!(sflags[token_value] & UNKNOWN_SFLAG)) - && (!(sflags[token_value] & REPLACE_SFLAG)))) + if (token_type != SYMBOL_TT) { ebf_error("routine name", token_text); return(FALSE); } + if ((!(sflags[token_value] & UNKNOWN_SFLAG)) + && (!(sflags[token_value] & REPLACE_SFLAG))) + { ebf_symbol_error("routine name", token_text, typename(stypes[token_value]), slines[token_value]); + return(FALSE); + } routine_symbol = token_value; @@ -614,6 +612,11 @@ extern void parse_code_block(int break_label, int continue_label, { do { begin_syntax_line(TRUE); get_next_token(); + + if ((token_type == SEP_TT) && (token_value == HASH_SEP)) + { parse_directive(TRUE); + continue; + } if (token_type == SEP_TT && token_value == CLOSE_BRACE_SEP) { if (switch_clause_made && (!default_clause_made)) assemble_label_no(switch_label); diff --git a/src/tables.c b/src/tables.c index df3cdfb..8a29da8 100644 --- a/src/tables.c +++ b/src/tables.c @@ -3,9 +3,8 @@ /* end of dynamic memory, gluing together all the required */ /* tables. */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -18,7 +17,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/text.c b/src/text.c index 3161238..8a1ae31 100644 --- a/src/text.c +++ b/src/text.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "text" : Text translation, the abbreviations optimiser, the dictionary */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -16,7 +15,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ @@ -1573,6 +1572,8 @@ static void dictionary_prepare_z(char *dword, uchar *optresult) applying to the text of dictionary entries: first produce a sequence of 6 (v3) or 9 (v4+) Z-characters */ + int dictsize = (version_number==3) ? 6 : 9; + number_and_case = 0; for (i=0, j=0; dword[j]!=0; i++, j++) @@ -1588,7 +1589,7 @@ to give number of dictionary word", dword); } break; } - if (i>=9) break; + if (i>=dictsize) break; k=(int) dword[j]; if (k==(int) '\'') diff --git a/src/veneer.c b/src/veneer.c index 519e085..cbb4c3e 100644 --- a/src/veneer.c +++ b/src/veneer.c @@ -3,9 +3,8 @@ /* by the compiler (e.g. DefArt) which the program doesn't */ /* provide */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -18,7 +17,7 @@ /* GNU General Public License for more details. */ /* */ /* You should have received a copy of the GNU General Public License */ -/* along with Inform. If not, see https://gnu.org/licenses/ */ +/* along with Inform. If not, see https://gnu.org/licenses/ * /* */ /* ------------------------------------------------------------------------- */ diff --git a/src/verbs.c b/src/verbs.c index 9e83057..8b7e649 100644 --- a/src/verbs.c +++ b/src/verbs.c @@ -2,9 +2,8 @@ /* "verbs" : Manages actions and grammar tables; parses the directives */ /* Verb and Extend. */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2020 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2020 */ /* */ /* Inform is free software: you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -146,13 +145,15 @@ extern void make_fake_action(void) ebf_error("new fake action name", token_text); panic_mode_error_recovery(); return; } + /* Action symbols (including fake_actions) may collide with other kinds of symbols. So we don't check that. */ snprintf(action_sub, MAX_IDENTIFIER_LENGTH+4, "%s__A", token_text); i = symbol_index(action_sub, -1); if (!(sflags[i] & UNKNOWN_SFLAG)) { discard_token_location(beginning_debug_location); - ebf_error("new fake action name", token_text); + /* The user didn't know they were defining FOO__A, but they were and it's a problem. */ + ebf_symbol_error("new fake action name", action_sub, typename(stypes[i]), slines[i]); panic_mode_error_recovery(); return; } diff --git a/version.sh b/version.sh deleted file mode 100755 index 9e63166..0000000 --- a/version.sh +++ /dev/null @@ -1,17 +0,0 @@ -# This file is part of Inform. -# -# Inform is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# theFree Software Foundation, either version 3 of the License, or -#(at your option) any later version. -# -# Inform is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Inform. If not, see https://gnu.org/licenses/ - -commit_count=$(git rev-list HEAD --count) -echo "6.$commit_count" \ No newline at end of file -- 2.31.1