Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/powerquery-parser",
"version": "0.16.1",
"version": "0.17.0",
"description": "A parser for the Power Query/M formula language.",
"author": "Microsoft",
"license": "MIT",
Expand Down
8 changes: 8 additions & 0 deletions src/powerquery-parser/parser/parseBehavior.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

export enum ParseBehavior {
ParseEitherExpressionOrSection = "ParseEitherExpressionOrSection",
ParseExpression = "ParseExpression",
ParseSection = "ParseSection",
}
4 changes: 3 additions & 1 deletion src/powerquery-parser/parser/parseSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
import { Ast } from "../language";
import { CommonSettings } from "../common";
import { LexerSnapshot } from "../lexer";
import { ParseBehavior } from "./parseBehavior";
import { Parser } from "./parser";
import { ParseState } from "./parseState";

export interface ParseSettings extends CommonSettings {
readonly parseBehavior: ParseBehavior;
readonly parser: Parser;
readonly newParseState: (lexerSnapshot: LexerSnapshot, overrides: Partial<ParseState> | undefined) => ParseState;
readonly newParseState: (lexerSnapshot: LexerSnapshot, overrides?: Partial<ParseState>) => ParseState;
readonly parserEntryPoint:
| ((state: ParseState, parser: Parser, correlationId: number | undefined) => Promise<Ast.TNode>)
| undefined;
Expand Down
2 changes: 2 additions & 0 deletions src/powerquery-parser/parser/parseState/parseState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { Disambiguation } from "../disambiguation";
import { ICancellationToken } from "../../common";
import { LexerSnapshot } from "../../lexer";
import { ParseBehavior } from "../parseBehavior";
import { ParseContext } from "..";
import { Token } from "../../language";
import { TraceManager } from "../../common/trace";
Expand All @@ -13,6 +14,7 @@ export interface ParseState {
readonly disambiguationBehavior: Disambiguation.DismabiguationBehavior;
readonly lexerSnapshot: LexerSnapshot;
readonly locale: string;
readonly parseBehavior: ParseBehavior;
readonly traceManager: TraceManager;
contextState: ParseContext.State;
currentContextNode: ParseContext.TNode | undefined;
Expand Down
4 changes: 3 additions & 1 deletion src/powerquery-parser/parser/parseState/parseStateUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import { NoOpTraceManagerInstance, Trace } from "../../common/trace";
import { DefaultLocale } from "../../localization";
import { Disambiguation } from "../disambiguation";
import { LexerSnapshot } from "../../lexer";
import { ParseBehavior } from "../parseBehavior";
import { ParseState } from "./parseState";
import { SequenceKind } from "../error";

export function newState(lexerSnapshot: LexerSnapshot, overrides: Partial<ParseState> | undefined): ParseState {
export function newState(lexerSnapshot: LexerSnapshot, overrides?: Partial<ParseState>): ParseState {
const tokenIndex: number = overrides?.tokenIndex ?? 0;
const currentToken: Token.Token | undefined = lexerSnapshot.tokens[tokenIndex];
const currentTokenKind: Token.TokenKind | undefined = currentToken?.kind;
Expand All @@ -30,6 +31,7 @@ export function newState(lexerSnapshot: LexerSnapshot, overrides: Partial<ParseS

return {
...overrides,
parseBehavior: overrides?.parseBehavior ?? ParseBehavior.ParseEitherExpressionOrSection,
disambiguationBehavior: overrides?.disambiguationBehavior ?? Disambiguation.DismabiguationBehavior.Thorough,
lexerSnapshot,
locale: overrides?.locale ?? DefaultLocale,
Expand Down
7 changes: 0 additions & 7 deletions src/powerquery-parser/parser/parser/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ export interface Parser {
correlationId: number | undefined,
) => Ast.IdentifierExpression;

// 12.2.1 Documents
readonly readDocument: (
state: ParseState,
parser: Parser,
correlationId: number | undefined,
) => Promise<Ast.TDocument>;

// 12.2.2 Section Documents
readonly readSectionDocument: (
state: ParseState,
Expand Down
Loading
Loading