Fix AS210 error where expressions are never null (#45)

* Fix AS210 error where expressions are never null * fix AssemblyScript 0.27.0 build error * revert assemblyscript to ^0.25.0 to resolve npm issues
ColinEberhardt · Nov 11, 2023 · c9e1d77 · c9e1d77
1 parent ffd112f
commit c9e1d77
Show file tree

Hide file tree

Showing 4 changed files with 13,537 additions and 9,111 deletions.
diff --git a/assembly/nfa/matcher.ts b/assembly/nfa/matcher.ts
@@ -17,7 +17,7 @@ const enum MatcherType {
  CharacterClass,
 }
 export class Matcher {
- @lazy static _flags: Flags;
+ @lazy static _flags!: Flags;
 
  constructor(readonly type: MatcherType) {}
 

diff --git a/assembly/regexp.ts b/assembly/regexp.ts
@@ -132,18 +132,19 @@ export class RegExp {
 
  astWalker(ast, expandRepetitions);
 
- this.nfa = Automata.toNFA(ast, flags);
+ const nfa = Automata.toNFA(ast, flags);
 
  // find all the group marker states
  RegExp.gm = new Array<GroupStartMarkerState>();
- nfaWalker(this.nfa.start, (state) => {
+ nfaWalker(nfa.start, (state) => {
  if (state instanceof GroupStartMarkerState) {
  const startMarker = state as GroupStartMarkerState;
  if (startMarker.capturing) {
  RegExp.gm.push(state as GroupStartMarkerState);
  }
  }
  });
+ this.nfa = nfa;
  this.groupMarkers = RegExp.gm;
 
  this.flags = flags;
@@ -159,7 +160,7 @@ export class RegExp {
  let len = str.length;
  if (!len) {
  const matchStr = recursiveBacktrackingSearch(this.nfa.start, "");
- return matchStr != null ? new Match([matchStr!], 0, str) : null;
+ return matchStr != null ? new Match([matchStr], 0, str) : null;
  }
 
  // search for a match at each index within the string
@@ -182,8 +183,9 @@ export class RegExp {
  gm.capture = gm.flagged ? gm.capture : "";
  });
 
+ const matches: string[] = [matchStr];
  const match = new Match(
- [matchStr!].concat(lastCapturesForGroup(groupMarkers)),
+ matches.concat(lastCapturesForGroup(groupMarkers)),
  matchIndex,
  str
  );