diff options
| author | William Deegan <bill@baddogconsulting.com> | 2022-07-20 15:53:25 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2022-07-20 15:53:25 (GMT) |
| commit | d9879189cce1796c3459cea017ba55d685d65d09 (patch) | |
| tree | c18a2fcf3cb923a57c32e752bf948a247e731f94 /SCons/Tool | |
| parent | baf96f12d0e4fa015fefc31c79ab71d33f898fcf (diff) | |
| download | SCons-d9879189cce1796c3459cea017ba55d685d65d09.zip SCons-d9879189cce1796c3459cea017ba55d685d65d09.tar.gz SCons-d9879189cce1796c3459cea017ba55d685d65d09.tar.bz2 | |
LEX_TABLE_FILE -> LEX_TABLES_FILE
Diffstat (limited to 'SCons/Tool')
| -rw-r--r-- | SCons/Tool/lex.py | 8 | ||||
| -rw-r--r-- | SCons/Tool/lex.xml | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/SCons/Tool/lex.py b/SCons/Tool/lex.py index 60ae4bd..3f1a3ad 100644 --- a/SCons/Tool/lex.py +++ b/SCons/Tool/lex.py @@ -86,11 +86,11 @@ def lexEmitter(target, source, env) -> tuple: # rewrite user-supplied file string with a node, we need later env.Replace(LEX_HEADER_FILE=env.File(lexheaderfile)) - lextablesfile = env.subst("$LEX_TABLE_FILE", target=target, source=source) + lextablesfile = env.subst("$LEX_TABLES_FILE", target=target, source=source) if lextablesfile: target.append(lextablesfile) # rewrite user-supplied file string with a node, we need later - env.Replace(LEX_TABLE_FILE=env.File(lextablesfile)) + env.Replace(LEX_TABLES_FILE=env.File(lextablesfile)) return target, source @@ -149,7 +149,7 @@ def generate(env) -> None: LEX=env.Detect(BINS), LEXFLAGS=CLVar(""), LEX_HEADER_FILE="", - LEX_TABLE_FILE="", + LEX_TABLES_FILE="", ) if sys.platform == 'win32': @@ -159,7 +159,7 @@ def generate(env) -> None: env["LEXCOM"] = "$LEX $LEXFLAGS $_LEX_HEADER $_LEX_TABLES -t $SOURCES > $TARGET" env['_LEX_HEADER'] = '${LEX_HEADER_FILE and "--header-file=" + str(LEX_HEADER_FILE)}' - env['_LEX_TABLES'] = '${LEX_TABLE_FILE and "--tables-file=" + str(LEX_TABLE_FILE)}' + env['_LEX_TABLES'] = '${LEX_TABLES_FILE and "--tables-file=" + str(LEX_TABLES_FILE)}' def exists(env) -> Optional[str]: diff --git a/SCons/Tool/lex.xml b/SCons/Tool/lex.xml index e68a2bf..391e429 100644 --- a/SCons/Tool/lex.xml +++ b/SCons/Tool/lex.xml @@ -61,7 +61,7 @@ Sets construction variables for the &lex; lexical analyser. <item>LEXCOMSTR</item> <item>LEXFLAGS</item> <item>LEX_HEADER_FILE</item> -<item>LEX_TABLE_FILE</item> +<item>LEX_TABLES_FILE</item> </uses> </tool> @@ -113,7 +113,7 @@ the output file is named by the option argument. Note that files specified by <option>--header-file=</option> and <option>--tables-file=</option> may not be properly handled by &SCons; in all situations. Consider using -&cv-link-LEX_HEADER_FILE; and &cv-link-LEX_TABLE_FILE; instead. +&cv-link-LEX_HEADER_FILE; and &cv-link-LEX_TABLES_FILE; instead. </para> </summary> </cvar> @@ -129,7 +129,7 @@ command-line option. Use this in preference to including </summary> </cvar> -<cvar name="LEX_TABLE_FILE"> +<cvar name="LEX_TABLES_FILE"> <summary> <para> If supplied, write the lex tables to a file with the name |