Update types, use default constant for variables

Author: znorman-harris

libs/parsing/syntax-tree/src/lib/parsed.interface.ts

@@ -2,14 +2,18 @@ import { IFoundTokens } from '@idl/tokenizer';
 import { GlobalTokens, ICompileOptions } from '@idl/types/core';
 import { IDisabledProblems, SyntaxProblems } from '@idl/types/problem-codes';
 import { PositionArray } from '@idl/types/tokenizer';
+import copy from 'fast-copy';
 import { DocumentSymbol, SemanticTokens } from 'vscode-languageserver';
 
 import { SyntaxTree } from './branches.interface';
 import {
   DEFAULT_USES_THESE_GLOBAL_TOKEN,
   UsesTheseGlobalTokens,
 } from './build-syntax-tree.interface';
-import { ILocalTokens } from './populators/populate-local.interface';
+import {
+  DEFAULT_LOCAL_TOKENS,
+  ILocalTokens,
+} from './populators/populate-local.interface';
 
 /**
  * Type of parsed item that we have
@@ -90,11 +94,7 @@ export const DEFAULT_PARSED: IParsed = {
   postProcessProblems: [],
   tree: [],
   global: [],
-  local: {
-    func: {},
-    pro: {},
-    main: {},
-  },
+  local: copy(DEFAULT_LOCAL_TOKENS),
   compile: {
     func: {},
     pro: {},

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

@@ -64,17 +64,15 @@ export interface ILocalIndexedToken<T extends LocalTokenTypes>
   meta: LocalTokenMetadata<T>;
 }
 
-/**
- * Local tokens that we extract from a routine or main level program
- */
-export type LocalTokens = ILocalIndexedToken<LocalTokenTypes>[];
+/** Single local token (i.e. variable in IDL code) */
+export type LocalToken = ILocalIndexedToken<LocalTokenTypes>;
 
 /**
  * Lookup for tokens defined locally within a routine or main level program
  */
 export interface ILocalTokenLookup {
   /** Key should be lower-case variable name */
-  [key: string]: ILocalIndexedToken<LocalTokenTypes>;
+  [key: string]: LocalToken;
 }
 
 /**
@@ -94,3 +92,12 @@ export interface ILocalTokens {
    */
   main: ILocalTokenLookup;
 }
+
+/**
+ * Default tokens for local
+ */
+export const DEFAULT_LOCAL_TOKENS: ILocalTokens = {
+  pro: {},
+  func: {},
+  main: {},
+};