X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Flexer.c;h=f79a6e6118c823aed23552c54b77431786ca41c0;hb=c881aa3386c00d7021ffabf2f66275d6c110c1c1;hp=f03aba5703428703b503cf1f2c5e3c002167f541;hpb=81ffe9a7de1db0b3a318a053b38882d1b7ab304c;p=inform.git diff --git a/src/lexer.c b/src/lexer.c index f03aba5..f79a6e6 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -1,9 +1,8 @@ /* ------------------------------------------------------------------------- */ /* "lexer" : Lexical analyser */ /* */ -/* Copyright (c) Graham Nelson 1993 - 2018 */ -/* */ -/* This file is part of Inform. */ +/* Part of Inform 6.35 */ +/* copyright (c) Graham Nelson 1993 - 2021 */ /* */ /* 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/ * /* */ /* ------------------------------------------------------------------------- */ @@ -493,7 +492,7 @@ keyword_group directive_keywords = "string", "table", "buffer", "data", "initial", "initstr", "with", "private", "has", "class", "error", "fatalerror", "warning", - "terminating", + "terminating", "static", "" }, DIR_KEYWORD_TT, FALSE, TRUE }; @@ -954,6 +953,8 @@ extern int is_systemfile(void) extern void set_origsource_location(char *source, int32 line, int32 charnum) { + int file_no; + if (!source) { /* Clear the Origsource declaration. */ CurrentLB->orig_file = 0; @@ -964,7 +965,7 @@ extern void set_origsource_location(char *source, int32 line, int32 charnum) } /* Get the file number for a new or existing InputFiles entry. */ - int file_no = register_orig_sourcefile(source); + file_no = register_orig_sourcefile(source); CurrentLB->orig_file = file_no; CurrentLB->orig_source = InputFiles[file_no-1].filename;