Rename variable extraction routine

Author: znorman-harris

libs/parsing/syntax-tree/src/index.ts

@@ -44,10 +44,10 @@ export * from './lib/populate-index';
 export * from './lib/populate-scope';
 export * from './lib/populate-scope-detail';
 export * from './lib/populate-scope-detail-and-reset-token-cache';
-export * from './lib/populators/get-unique-variables';
 export * from './lib/populators/populate-global';
 export * from './lib/populators/populate-global.interface';
 export * from './lib/populators/populate-local.interface';
+export * from './lib/populators/populate-variables';
 export * from './lib/post-process-problems';
 export * from './lib/post-processor.interface';
 export * from './lib/recursion-and-callbacks/tree-callback-handler.class';

libs/parsing/syntax-tree/src/lib/build-syntax-tree.ts

@@ -24,7 +24,7 @@ import {
 import { DEFAULT_PARSED, IParsed } from './parsed.interface';
 import { PopulateIndex } from './populate-index';
 import { PopulateScope } from './populate-scope';
-import { GetUniqueVariables } from './populators/get-unique-variables';
+import { PopulateVariables } from './populators/populate-variables';
 import { IDL_SYNTAX_TREE_POST_PROCESSOR } from './post-processor.interface';
 import { DEFAULT_CURRENT } from './recursion-and-callbacks/tree-recurser.interface';
 import { SyntaxProblemWithTranslation } from './syntax-problem-with';
@@ -335,7 +335,7 @@ export function PopulateLocal(parsed: IParsed) {
       // inside of "populate-global.ts" or you can search for the name of the
       // function "GetUniqueVariables("
       case TOKEN_NAMES.MAIN_LEVEL:
-        local.main = GetUniqueVariables(
+        local.main = PopulateVariables(
           branch as IBranch<MainLevelToken>,
           parsed,
           parsed.compile.main

libs/parsing/syntax-tree/src/lib/populators/populate-global.ts

@@ -29,10 +29,10 @@ import { GenerateRoutineMetadataFast } from '../docs/generate-routine-metadata-f
 import { IParsed } from '../parsed.interface';
 import { FindStructureDefs } from './find-structure-defs';
 import { GetCompileOpts } from './get-compile-opts';
-import { GetUniqueVariables } from './get-unique-variables';
 import { MAIN_LEVEL_NAME } from './populate-global.interface';
 import { LOCAL_TOKEN_LOOKUP } from './populate-local.interface';
 import { PopulateLocalForMain } from './populate-local-for-main';
+import { PopulateVariables } from './populate-variables';
 
 /**
  * Populates a lookup with quick information for where things are defined
@@ -137,7 +137,7 @@ export function PopulateGlobalLocalCompileOpts(
               global.push(add);
               parsed.compile.func[name] = full ? GetCompileOpts(branch) : [];
               parsed.local.func[name] = full
-                ? GetUniqueVariables(
+                ? PopulateVariables(
                     branch as IBranch<RoutineFunctionToken>,
                     parsed,
                     parsed.compile.func[name],
@@ -187,7 +187,7 @@ export function PopulateGlobalLocalCompileOpts(
 
               parsed.compile.func[name] = full ? GetCompileOpts(branch) : [];
               parsed.local.func[name] = full
-                ? GetUniqueVariables(
+                ? PopulateVariables(
                     branch as IBranch<RoutineFunctionToken>,
                     parsed,
                     parsed.compile.func[name],
@@ -276,7 +276,7 @@ export function PopulateGlobalLocalCompileOpts(
               global.push(add);
               parsed.compile.pro[name] = full ? GetCompileOpts(branch) : [];
               parsed.local.pro[name] = full
-                ? GetUniqueVariables(
+                ? PopulateVariables(
                     branch as IBranch<RoutineProcedureToken>,
                     parsed,
                     parsed.compile.pro[name],
@@ -303,7 +303,7 @@ export function PopulateGlobalLocalCompileOpts(
               global.push(add);
               parsed.compile.pro[name] = full ? GetCompileOpts(branch) : [];
               parsed.local.pro[name] = full
-                ? GetUniqueVariables(
+                ? PopulateVariables(
                     branch as IBranch<RoutineProcedureToken>,
                     parsed,
                     parsed.compile.pro[name],

libs/parsing/syntax-tree/src/lib/populators/populate-local-for-main.ts

@@ -2,7 +2,7 @@ import { MainLevelToken, TOKEN_NAMES } from '@idl/tokenizer';
 
 import { IBranch } from '../branches.interface';
 import { IParsed } from '../parsed.interface';
-import { GetUniqueVariables } from './get-unique-variables';
+import { PopulateVariables } from './populate-variables';
 
 /**
  * Populates a lookup with quick information for where local things are defined
@@ -25,7 +25,7 @@ export function PopulateLocalForMain(parsed: IParsed) {
       // inside of "populate-global.ts" or you can search for the name of the
       // function "GetUniqueVariables("
       case TOKEN_NAMES.MAIN_LEVEL:
-        local.main = GetUniqueVariables(
+        local.main = PopulateVariables(
           branch as IBranch<MainLevelToken>,
           parsed,
           parsed.compile.main

…c/lib/populators/get-unique-variables.ts …src/lib/populators/populate-variables.tslibs/parsing/syntax-tree/src/lib/populators/get-unique-variables.ts renamed to libs/parsing/syntax-tree/src/lib/populators/populate-variables.ts libs/parsing/syntax-tree/src/lib/populators/get-unique-variables.ts renamed to libs/parsing/syntax-tree/src/lib/populators/populate-variables.ts

@@ -36,7 +36,7 @@ import { ReplaceFunctionsAsVariables } from './replace-functions-as-variables';
  * idl2 or strictarr, then we check and see if there are functions that should
  * really be represented as variables.
  */
-export function GetUniqueVariables(
+export function PopulateVariables(
   branch: IBranch<
     RoutineProcedureToken | RoutineFunctionToken | MainLevelToken
   >,
@@ -106,6 +106,7 @@ export function GetUniqueVariables(
         meta: {
           display: variable.match[0],
           isDefined: true,
+          canReset: false,
           usage: [], // dont init, populated below
           docs: kw.docs,
           source: GLOBAL_TOKEN_SOURCE_LOOKUP.USER,
@@ -137,6 +138,7 @@ export function GetUniqueVariables(
         meta: {
           display: origName,
           isDefined: true,
+          canReset: false,
           usage: [args[i].pos], // dont init, populated below
           docs: name in gArgs ? gArgs[name].docs : '',
           source: GLOBAL_TOKEN_SOURCE_LOOKUP.USER,
@@ -195,17 +197,19 @@ export function GetUniqueVariables(
         vars[i].token.scope[1] === TOKEN_NAMES.ROUTINE_NAME ||
         vars[i].token.scope[1] === TOKEN_NAMES.ROUTINE_METHOD_NAME;
 
+      /** Check if the variable is defined */
+      const isDefined =
+        (inDef && name !== 'self') || parent === TOKEN_NAMES.CONTROL_COMMON;
+
       // define what we add, do this so it is strictly typed
       const add: ILocalIndexedToken<LocalVariableToken> = {
         type: LOCAL_TOKEN_LOOKUP.VARIABLE,
         name: name,
         pos: vars[i].token.pos,
         meta: {
           display: origName,
-          isDefined:
-            (inDef && name !== 'self') || parent === TOKEN_NAMES.CONTROL_COMMON
-              ? true
-              : false,
+          isDefined: isDefined ? true : false,
+          canReset: isDefined ? false : true,
           usage: [vars[i].token.pos],
           docs: docs,
           source: GLOBAL_TOKEN_SOURCE_LOOKUP.USER,