@malloydata/malloy 0.0.2 → 0.0.4

package/dist/lang/lib/Malloy/MalloyParser.d.ts

@@ -6,8 +6,8 @@ import { RuleContext } from "antlr4ts/RuleContext";
 import { TerminalNode } from "antlr4ts/tree/TerminalNode";
 import { TokenStream } from "antlr4ts/TokenStream";
 import { Vocabulary } from "antlr4ts/Vocabulary";
-import { MalloyListener } from "./MalloyListener";
-import { MalloyVisitor } from "./MalloyVisitor";
+import { MalloyParserListener } from "./MalloyParserListener";
+import { MalloyParserVisitor } from "./MalloyParserVisitor";
 export declare class MalloyParser extends Parser {
     static readonly JSON_STRING = 1;
     static readonly ACCEPT = 2;
@@ -33,112 +33,113 @@ export declare class MalloyParser extends Parser {
     static readonly SAMPLE = 22;
     static readonly SOURCE = 23;
     static readonly SQL = 24;
-    static readonly TOP = 25;
-    static readonly WHERE = 26;
-    static readonly ALL = 27;
-    static readonly AND = 28;
-    static readonly AS = 29;
-    static readonly ASC = 30;
-    static readonly AVG = 31;
-    static readonly BOOLEAN = 32;
-    static readonly BY = 33;
-    static readonly CASE = 34;
-    static readonly CAST = 35;
-    static readonly CONDITION = 36;
-    static readonly COUNT = 37;
-    static readonly DATE = 38;
-    static readonly DAY = 39;
-    static readonly DESC = 40;
-    static readonly DISTINCT = 41;
-    static readonly ELSE = 42;
-    static readonly END = 43;
-    static readonly EXCLUDE = 44;
-    static readonly FALSE = 45;
-    static readonly FOR = 46;
-    static readonly FROM = 47;
-    static readonly FROM_SQL = 48;
-    static readonly HAS = 49;
-    static readonly HOUR = 50;
-    static readonly IMPORT = 51;
-    static readonly IS = 52;
-    static readonly JSON = 53;
-    static readonly LAST = 54;
-    static readonly MAX = 55;
-    static readonly MIN = 56;
-    static readonly MINUTE = 57;
-    static readonly MONTH = 58;
-    static readonly NOT = 59;
-    static readonly NOW = 60;
-    static readonly NULL = 61;
-    static readonly NUMBER = 62;
-    static readonly ON = 63;
-    static readonly OR = 64;
-    static readonly PICK = 65;
-    static readonly QMARK = 66;
-    static readonly QUARTER = 67;
-    static readonly SECOND = 68;
-    static readonly STRING = 69;
-    static readonly SUM = 70;
-    static readonly TABLE = 71;
-    static readonly THEN = 72;
-    static readonly THIS = 73;
-    static readonly TIMESTAMP = 74;
-    static readonly TO = 75;
-    static readonly TRUE = 76;
-    static readonly TURTLE = 77;
-    static readonly WEEK = 78;
-    static readonly WHEN = 79;
-    static readonly WITH = 80;
-    static readonly YEAR = 81;
-    static readonly UNGROUPED = 82;
-    static readonly STRING_ESCAPE = 83;
-    static readonly HACKY_REGEX = 84;
-    static readonly STRING_LITERAL = 85;
-    static readonly AMPER = 86;
-    static readonly ARROW = 87;
-    static readonly FAT_ARROW = 88;
-    static readonly OPAREN = 89;
-    static readonly CPAREN = 90;
-    static readonly OBRACK = 91;
-    static readonly CBRACK = 92;
-    static readonly OCURLY = 93;
-    static readonly CCURLY = 94;
-    static readonly DOUBLECOLON = 95;
-    static readonly COLON = 96;
-    static readonly COMMA = 97;
-    static readonly DOT = 98;
-    static readonly LT = 99;
-    static readonly GT = 100;
-    static readonly EQ = 101;
-    static readonly NE = 102;
-    static readonly LTE = 103;
-    static readonly GTE = 104;
-    static readonly PLUS = 105;
-    static readonly MINUS = 106;
-    static readonly STAR = 107;
-    static readonly STARSTAR = 108;
-    static readonly SLASH = 109;
-    static readonly BAR = 110;
-    static readonly SEMI = 111;
-    static readonly NOT_MATCH = 112;
-    static readonly MATCH = 113;
-    static readonly LITERAL_TIMESTAMP = 114;
-    static readonly LITERAL_DAY = 115;
-    static readonly LITERAL_QUARTER = 116;
-    static readonly LITERAL_MONTH = 117;
-    static readonly LITERAL_WEEK = 118;
-    static readonly LITERAL_YEAR = 119;
-    static readonly IDENTIFIER = 120;
-    static readonly PERCENT_LITERAL = 121;
-    static readonly INTEGER_LITERAL = 122;
-    static readonly NUMERIC_LITERAL = 123;
-    static readonly OBJECT_NAME_LITERAL = 124;
-    static readonly BLOCK_COMMENT = 125;
-    static readonly COMMENT_TO_EOL = 126;
-    static readonly WHITE_SPACE = 127;
-    static readonly SQL_STRING = 128;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 129;
-    static readonly UNEXPECTED_CHAR = 130;
+    static readonly FANCYSQL = 25;
+    static readonly TOP = 26;
+    static readonly WHERE = 27;
+    static readonly ALL = 28;
+    static readonly AND = 29;
+    static readonly AS = 30;
+    static readonly ASC = 31;
+    static readonly AVG = 32;
+    static readonly BOOLEAN = 33;
+    static readonly BY = 34;
+    static readonly CASE = 35;
+    static readonly CAST = 36;
+    static readonly CONDITION = 37;
+    static readonly COUNT = 38;
+    static readonly DATE = 39;
+    static readonly DAY = 40;
+    static readonly DESC = 41;
+    static readonly DISTINCT = 42;
+    static readonly ELSE = 43;
+    static readonly END = 44;
+    static readonly EXCLUDE = 45;
+    static readonly FALSE = 46;
+    static readonly FOR = 47;
+    static readonly FROM = 48;
+    static readonly FROM_SQL = 49;
+    static readonly HAS = 50;
+    static readonly HOUR = 51;
+    static readonly IMPORT = 52;
+    static readonly IS = 53;
+    static readonly JSON = 54;
+    static readonly LAST = 55;
+    static readonly MAX = 56;
+    static readonly MIN = 57;
+    static readonly MINUTE = 58;
+    static readonly MONTH = 59;
+    static readonly NOT = 60;
+    static readonly NOW = 61;
+    static readonly NULL = 62;
+    static readonly NUMBER = 63;
+    static readonly ON = 64;
+    static readonly OR = 65;
+    static readonly PICK = 66;
+    static readonly QMARK = 67;
+    static readonly QUARTER = 68;
+    static readonly SECOND = 69;
+    static readonly STRING = 70;
+    static readonly SUM = 71;
+    static readonly TABLE = 72;
+    static readonly THEN = 73;
+    static readonly THIS = 74;
+    static readonly TIMESTAMP = 75;
+    static readonly TO = 76;
+    static readonly TRUE = 77;
+    static readonly TURTLE = 78;
+    static readonly WEEK = 79;
+    static readonly WHEN = 80;
+    static readonly WITH = 81;
+    static readonly YEAR = 82;
+    static readonly UNGROUPED = 83;
+    static readonly STRING_ESCAPE = 84;
+    static readonly HACKY_REGEX = 85;
+    static readonly STRING_LITERAL = 86;
+    static readonly AMPER = 87;
+    static readonly ARROW = 88;
+    static readonly FAT_ARROW = 89;
+    static readonly OPAREN = 90;
+    static readonly CPAREN = 91;
+    static readonly OBRACK = 92;
+    static readonly CBRACK = 93;
+    static readonly OCURLY = 94;
+    static readonly CCURLY = 95;
+    static readonly DOUBLECOLON = 96;
+    static readonly COLON = 97;
+    static readonly COMMA = 98;
+    static readonly DOT = 99;
+    static readonly LT = 100;
+    static readonly GT = 101;
+    static readonly EQ = 102;
+    static readonly NE = 103;
+    static readonly LTE = 104;
+    static readonly GTE = 105;
+    static readonly PLUS = 106;
+    static readonly MINUS = 107;
+    static readonly STAR = 108;
+    static readonly STARSTAR = 109;
+    static readonly SLASH = 110;
+    static readonly BAR = 111;
+    static readonly SEMI = 112;
+    static readonly NOT_MATCH = 113;
+    static readonly MATCH = 114;
+    static readonly LITERAL_TIMESTAMP = 115;
+    static readonly LITERAL_DAY = 116;
+    static readonly LITERAL_QUARTER = 117;
+    static readonly LITERAL_MONTH = 118;
+    static readonly LITERAL_WEEK = 119;
+    static readonly LITERAL_YEAR = 120;
+    static readonly IDENTIFIER = 121;
+    static readonly PERCENT_LITERAL = 122;
+    static readonly INTEGER_LITERAL = 123;
+    static readonly NUMERIC_LITERAL = 124;
+    static readonly OBJECT_NAME_LITERAL = 125;
+    static readonly BLOCK_COMMENT = 126;
+    static readonly COMMENT_TO_EOL = 127;
+    static readonly WHITE_SPACE = 128;
+    static readonly SQL_STRING = 129;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 130;
+    static readonly UNEXPECTED_CHAR = 131;
     static readonly RULE_malloyDocument = 0;
     static readonly RULE_malloyStatement = 1;
     static readonly RULE_defineExploreStatement = 2;
@@ -237,10 +238,9 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_jsonObject = 95;
     static readonly RULE_jsonProperty = 96;
     static readonly RULE_jsonArray = 97;
-    static readonly RULE_sqlBlock = 98;
-    static readonly RULE_sqlExploreNameRef = 99;
-    static readonly RULE_sqlCommandNameDef = 100;
-    static readonly RULE_connectionName = 101;
+    static readonly RULE_sqlExploreNameRef = 98;
+    static readonly RULE_sqlCommandNameDef = 99;
+    static readonly RULE_connectionName = 100;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -350,7 +350,6 @@ export declare class MalloyParser extends Parser {
     jsonObject(): JsonObjectContext;
     jsonProperty(): JsonPropertyContext;
     jsonArray(): JsonArrayContext;
-    sqlBlock(): SqlBlockContext;
     sqlExploreNameRef(): SqlExploreNameRefContext;
     sqlCommandNameDef(): SqlCommandNameDefContext;
     connectionName(): ConnectionNameContext;
@@ -371,9 +370,9 @@ export declare class MalloyDocumentContext extends ParserRuleContext {
     SEMI(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class MalloyStatementContext extends ParserRuleContext {
     defineExploreStatement(): DefineExploreStatementContext | undefined;
@@ -382,27 +381,27 @@ export declare class MalloyStatementContext extends ParserRuleContext {
     importStatement(): ImportStatementContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefineExploreStatementContext extends ParserRuleContext {
     exploreKeyword(): ExploreKeywordContext;
     exploreDefinitionList(): ExploreDefinitionListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreKeywordContext extends ParserRuleContext {
     EXPLORE(): TerminalNode | undefined;
     SOURCE(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefineQueryContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -413,63 +412,63 @@ export declare class NamedQueries_stubContext extends DefineQueryContext {
     QUERY(): TerminalNode;
     topLevelQueryDefs(): TopLevelQueryDefsContext;
     constructor(ctx: DefineQueryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class AnonymousQueryContext extends DefineQueryContext {
     QUERY(): TerminalNode;
     topLevelAnonQueryDef(): TopLevelAnonQueryDefContext;
     constructor(ctx: DefineQueryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TopLevelAnonQueryDefContext extends ParserRuleContext {
     query(): QueryContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefineSQLStatementContext extends ParserRuleContext {
     SQL(): TerminalNode;
     sqlStatementDef(): SqlStatementDefContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SqlStatementDefContext extends ParserRuleContext {
-    sqlBlock(): SqlBlockContext;
+    SQL_STRING(): TerminalNode;
     sqlCommandNameDef(): SqlCommandNameDefContext | undefined;
     IS(): TerminalNode | undefined;
     ON(): TerminalNode | undefined;
     connectionName(): ConnectionNameContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ImportStatementContext extends ParserRuleContext {
     IMPORT(): TerminalNode;
     importURL(): ImportURLContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ImportURLContext extends ParserRuleContext {
     JSON_STRING(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TopLevelQueryDefsContext extends ParserRuleContext {
     topLevelQueryDef(): TopLevelQueryDefContext[];
@@ -478,9 +477,9 @@ export declare class TopLevelQueryDefsContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TopLevelQueryDefContext extends ParserRuleContext {
     queryName(): QueryNameContext;
@@ -488,17 +487,17 @@ export declare class TopLevelQueryDefContext extends ParserRuleContext {
     query(): QueryContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class RefineOperatorContext extends ParserRuleContext {
     PLUS(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -510,9 +509,9 @@ export declare class ExploreArrowQueryContext extends QueryContext {
     ARROW(): TerminalNode;
     pipelineFromName(): PipelineFromNameContext;
     constructor(ctx: QueryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ArrowQueryContext extends QueryContext {
     ARROW(): TerminalNode;
@@ -522,9 +521,9 @@ export declare class ArrowQueryContext extends QueryContext {
     pipeElement(i: number): PipeElementContext;
     refineOperator(): RefineOperatorContext | undefined;
     constructor(ctx: QueryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class PipelineFromNameContext extends ParserRuleContext {
     firstSegment(): FirstSegmentContext;
@@ -532,9 +531,9 @@ export declare class PipelineFromNameContext extends ParserRuleContext {
     pipeElement(i: number): PipeElementContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FirstSegmentContext extends ParserRuleContext {
     queryProperties(): QueryPropertiesContext | undefined;
@@ -542,18 +541,18 @@ export declare class FirstSegmentContext extends ParserRuleContext {
     refineOperator(): RefineOperatorContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class PipeElementContext extends ParserRuleContext {
     ARROW(): TerminalNode;
     queryProperties(): QueryPropertiesContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreTableContext extends ParserRuleContext {
     TABLE(): TerminalNode;
@@ -562,9 +561,9 @@ export declare class ExploreTableContext extends ParserRuleContext {
     CPAREN(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryPropertiesContext extends ParserRuleContext {
     filterShortcut(): FilterShortcutContext | undefined;
@@ -576,9 +575,9 @@ export declare class QueryPropertiesContext extends ParserRuleContext {
     SEMI(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FilterShortcutContext extends ParserRuleContext {
     OCURLY(): TerminalNode;
@@ -587,25 +586,25 @@ export declare class FilterShortcutContext extends ParserRuleContext {
     CCURLY(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreQueryNameContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryNameContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreDefinitionListContext extends ParserRuleContext {
     exploreDefinition(): ExploreDefinitionContext[];
@@ -614,9 +613,9 @@ export declare class ExploreDefinitionListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreDefinitionContext extends ParserRuleContext {
     exploreNameDef(): ExploreNameDefContext;
@@ -624,9 +623,9 @@ export declare class ExploreDefinitionContext extends ParserRuleContext {
     explore(): ExploreContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreContext extends ParserRuleContext {
     exploreSource(): ExploreSourceContext;
@@ -634,9 +633,9 @@ export declare class ExploreContext extends ParserRuleContext {
     refineOperator(): RefineOperatorContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreSourceContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -646,16 +645,16 @@ export declare class ExploreSourceContext extends ParserRuleContext {
 export declare class NamedSourceContext extends ExploreSourceContext {
     exploreName(): ExploreNameContext;
     constructor(ctx: ExploreSourceContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TableSourceContext extends ExploreSourceContext {
     exploreTable(): ExploreTableContext;
     constructor(ctx: ExploreSourceContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QuerySourceContext extends ExploreSourceContext {
     FROM(): TerminalNode;
@@ -663,9 +662,9 @@ export declare class QuerySourceContext extends ExploreSourceContext {
     query(): QueryContext;
     CPAREN(): TerminalNode;
     constructor(ctx: ExploreSourceContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SQLSourceContext extends ExploreSourceContext {
     FROM_SQL(): TerminalNode;
@@ -673,25 +672,25 @@ export declare class SQLSourceContext extends ExploreSourceContext {
     sqlExploreNameRef(): SqlExploreNameRefContext;
     CPAREN(): TerminalNode;
     constructor(ctx: ExploreSourceContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreNameDefContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreNameContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExplorePropertiesContext extends ParserRuleContext {
     OCURLY(): TerminalNode | undefined;
@@ -703,9 +702,9 @@ export declare class ExplorePropertiesContext extends ParserRuleContext {
     filterShortcut(): FilterShortcutContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreStatementContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -716,71 +715,71 @@ export declare class DefExploreDimensionContext extends ExploreStatementContext
     DIMENSION(): TerminalNode;
     dimensionDefList(): DimensionDefListContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExploreMeasureContext extends ExploreStatementContext {
     MEASURE(): TerminalNode;
     measureDefList(): MeasureDefListContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefDeclare_stubContext extends ExploreStatementContext {
     declareStatement(): DeclareStatementContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefJoin_stubContext extends ExploreStatementContext {
     joinStatement(): JoinStatementContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExploreWhereContext extends ExploreStatementContext {
     whereStatement(): WhereStatementContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExplorePrimaryKeyContext extends ExploreStatementContext {
     PRIMARY_KEY(): TerminalNode;
     fieldName(): FieldNameContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExploreRenameContext extends ExploreStatementContext {
     RENAME(): TerminalNode;
     renameList(): RenameListContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExploreEditFieldContext extends ExploreStatementContext {
     fieldNameList(): FieldNameListContext;
     ACCEPT(): TerminalNode | undefined;
     EXCEPT(): TerminalNode | undefined;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefExploreQueryContext extends ExploreStatementContext {
     QUERY(): TerminalNode;
     subQueryDefList(): SubQueryDefListContext;
     constructor(ctx: ExploreStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class RenameListContext extends ParserRuleContext {
     exploreRenameDef(): ExploreRenameDefContext[];
@@ -789,9 +788,9 @@ export declare class RenameListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreRenameDefContext extends ParserRuleContext {
     fieldName(): FieldNameContext[];
@@ -799,9 +798,9 @@ export declare class ExploreRenameDefContext extends ParserRuleContext {
     IS(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DimensionDefListContext extends ParserRuleContext {
     dimensionDef(): DimensionDefContext[];
@@ -810,9 +809,9 @@ export declare class DimensionDefListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class MeasureDefListContext extends ParserRuleContext {
     measureDef(): MeasureDefContext[];
@@ -821,9 +820,9 @@ export declare class MeasureDefListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldDefContext extends ParserRuleContext {
     fieldNameDef(): FieldNameDefContext;
@@ -831,33 +830,33 @@ export declare class FieldDefContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldNameDefContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinNameDefContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class MeasureDefContext extends ParserRuleContext {
     fieldDef(): FieldDefContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DeclareStatementContext extends ParserRuleContext {
     DECLARE(): TerminalNode;
@@ -867,9 +866,9 @@ export declare class DeclareStatementContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinStatementContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -880,25 +879,25 @@ export declare class DefJoinOneContext extends JoinStatementContext {
     JOIN_ONE(): TerminalNode;
     joinList(): JoinListContext;
     constructor(ctx: JoinStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefJoinManyContext extends JoinStatementContext {
     JOIN_MANY(): TerminalNode;
     joinList(): JoinListContext;
     constructor(ctx: JoinStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DefJoinCrossContext extends JoinStatementContext {
     JOIN_CROSS(): TerminalNode;
     joinList(): JoinListContext;
     constructor(ctx: JoinStatementContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinListContext extends ParserRuleContext {
     joinDef(): JoinDefContext[];
@@ -907,9 +906,9 @@ export declare class JoinListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinDefContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -923,9 +922,9 @@ export declare class JoinWithContext extends JoinDefContext {
     IS(): TerminalNode | undefined;
     explore(): ExploreContext | undefined;
     constructor(ctx: JoinDefContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinOnContext extends JoinDefContext {
     joinNameDef(): JoinNameDefContext;
@@ -934,26 +933,26 @@ export declare class JoinOnContext extends JoinDefContext {
     ON(): TerminalNode | undefined;
     joinExpression(): JoinExpressionContext | undefined;
     constructor(ctx: JoinDefContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinExpressionContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FilterStatementContext extends ParserRuleContext {
     whereStatement(): WhereStatementContext | undefined;
     havingStatement(): HavingStatementContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FilteredByContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -964,16 +963,16 @@ export declare class FilterByShortcutContext extends FilteredByContext {
     QMARK(): TerminalNode;
     fieldExpr(): FieldExprContext;
     constructor(ctx: FilteredByContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FilterByWhereContext extends FilteredByContext {
     whereStatement(): WhereStatementContext;
     constructor(ctx: FilteredByContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FilterClauseListContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext[];
@@ -982,27 +981,27 @@ export declare class FilterClauseListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class WhereStatementContext extends ParserRuleContext {
     WHERE(): TerminalNode;
     filterClauseList(): FilterClauseListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class HavingStatementContext extends ParserRuleContext {
     HAVING(): TerminalNode;
     filterClauseList(): FilterClauseListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SubQueryDefListContext extends ParserRuleContext {
     exploreQueryDef(): ExploreQueryDefContext[];
@@ -1011,17 +1010,17 @@ export declare class SubQueryDefListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreQueryNameDefContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExploreQueryDefContext extends ParserRuleContext {
     exploreQueryNameDef(): ExploreQueryNameDefContext;
@@ -1029,9 +1028,9 @@ export declare class ExploreQueryDefContext extends ParserRuleContext {
     pipelineFromName(): PipelineFromNameContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryStatementContext extends ParserRuleContext {
     groupByStatement(): GroupByStatementContext | undefined;
@@ -1049,18 +1048,18 @@ export declare class QueryStatementContext extends ParserRuleContext {
     sampleStatement(): SampleStatementContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class GroupByStatementContext extends ParserRuleContext {
     GROUP_BY(): TerminalNode;
     queryFieldList(): QueryFieldListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryFieldListContext extends ParserRuleContext {
     queryFieldEntry(): QueryFieldEntryContext[];
@@ -1069,17 +1068,17 @@ export declare class QueryFieldListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DimensionDefContext extends ParserRuleContext {
     fieldDef(): FieldDefContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryFieldEntryContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1089,25 +1088,25 @@ export declare class QueryFieldEntryContext extends ParserRuleContext {
 export declare class QueryFieldRefContext extends QueryFieldEntryContext {
     fieldPath(): FieldPathContext;
     constructor(ctx: QueryFieldEntryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QueryFieldDefContext extends QueryFieldEntryContext {
     dimensionDef(): DimensionDefContext;
     constructor(ctx: QueryFieldEntryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class NestStatementContext extends ParserRuleContext {
     NEST(): TerminalNode;
     nestedQueryList(): NestedQueryListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class NestedQueryListContext extends ParserRuleContext {
     nestEntry(): NestEntryContext[];
@@ -1116,9 +1115,9 @@ export declare class NestedQueryListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class NestEntryContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1130,45 +1129,45 @@ export declare class NestExistingContext extends NestEntryContext {
     queryProperties(): QueryPropertiesContext | undefined;
     refineOperator(): RefineOperatorContext | undefined;
     constructor(ctx: NestEntryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class NestDefContext extends NestEntryContext {
     queryName(): QueryNameContext;
     IS(): TerminalNode;
     pipelineFromName(): PipelineFromNameContext;
     constructor(ctx: NestEntryContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class AggregateStatementContext extends ParserRuleContext {
     AGGREGATE(): TerminalNode;
     queryFieldList(): QueryFieldListContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ProjectStatementContext extends ParserRuleContext {
     PROJECT(): TerminalNode;
     fieldCollection(): FieldCollectionContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class OrderByStatementContext extends ParserRuleContext {
     ORDER_BY(): TerminalNode;
     ordering(): OrderingContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class OrderingContext extends ParserRuleContext {
     orderBySpec(): OrderBySpecContext[];
@@ -1177,9 +1176,9 @@ export declare class OrderingContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class OrderBySpecContext extends ParserRuleContext {
     INTEGER_LITERAL(): TerminalNode | undefined;
@@ -1188,18 +1187,18 @@ export declare class OrderBySpecContext extends ParserRuleContext {
     DESC(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LimitStatementContext extends ParserRuleContext {
     LIMIT(): TerminalNode;
     INTEGER_LITERAL(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class BySpecContext extends ParserRuleContext {
     BY(): TerminalNode;
@@ -1207,9 +1206,9 @@ export declare class BySpecContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TopStatementContext extends ParserRuleContext {
     TOP(): TerminalNode;
@@ -1217,9 +1216,9 @@ export declare class TopStatementContext extends ParserRuleContext {
     bySpec(): BySpecContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class IndexElementContext extends ParserRuleContext {
     fieldPath(): FieldPathContext | undefined;
@@ -1227,9 +1226,9 @@ export declare class IndexElementContext extends ParserRuleContext {
     STAR(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class IndexFieldsContext extends ParserRuleContext {
     indexElement(): IndexElementContext[];
@@ -1238,9 +1237,9 @@ export declare class IndexFieldsContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class IndexStatementContext extends ParserRuleContext {
     INDEX(): TerminalNode;
@@ -1249,18 +1248,18 @@ export declare class IndexStatementContext extends ParserRuleContext {
     fieldName(): FieldNameContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SampleStatementContext extends ParserRuleContext {
     SAMPLE(): TerminalNode;
     sampleSpec(): SampleSpecContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SampleSpecContext extends ParserRuleContext {
     PERCENT_LITERAL(): TerminalNode | undefined;
@@ -1269,9 +1268,9 @@ export declare class SampleSpecContext extends ParserRuleContext {
     FALSE(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class AggregateContext extends ParserRuleContext {
     SUM(): TerminalNode | undefined;
@@ -1281,9 +1280,9 @@ export declare class AggregateContext extends ParserRuleContext {
     MAX(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class MalloyTypeContext extends ParserRuleContext {
     STRING(): TerminalNode | undefined;
@@ -1293,9 +1292,9 @@ export declare class MalloyTypeContext extends ParserRuleContext {
     TIMESTAMP(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class CompareOpContext extends ParserRuleContext {
     MATCH(): TerminalNode | undefined;
@@ -1308,9 +1307,9 @@ export declare class CompareOpContext extends ParserRuleContext {
     NE(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LiteralContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1320,53 +1319,53 @@ export declare class LiteralContext extends ParserRuleContext {
 export declare class ExprStringContext extends LiteralContext {
     STRING_LITERAL(): TerminalNode;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprNumberContext extends LiteralContext {
     NUMERIC_LITERAL(): TerminalNode | undefined;
     INTEGER_LITERAL(): TerminalNode | undefined;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprTimeContext extends LiteralContext {
     dateLiteral(): DateLiteralContext;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprNULLContext extends LiteralContext {
     NULL(): TerminalNode;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprBoolContext extends LiteralContext {
     TRUE(): TerminalNode | undefined;
     FALSE(): TerminalNode | undefined;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprRegexContext extends LiteralContext {
     HACKY_REGEX(): TerminalNode;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprNowContext extends LiteralContext {
     NOW(): TerminalNode;
     constructor(ctx: LiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class DateLiteralContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1376,61 +1375,61 @@ export declare class DateLiteralContext extends ParserRuleContext {
 export declare class LiteralTimestampContext extends DateLiteralContext {
     LITERAL_TIMESTAMP(): TerminalNode;
     constructor(ctx: DateLiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LiteralDayContext extends DateLiteralContext {
     LITERAL_DAY(): TerminalNode;
     constructor(ctx: DateLiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LiteralWeekContext extends DateLiteralContext {
     LITERAL_WEEK(): TerminalNode;
     constructor(ctx: DateLiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LiteralMonthContext extends DateLiteralContext {
     LITERAL_MONTH(): TerminalNode;
     constructor(ctx: DateLiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LiteralQuarterContext extends DateLiteralContext {
     LITERAL_QUARTER(): TerminalNode;
     constructor(ctx: DateLiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LiteralYearContext extends DateLiteralContext {
     LITERAL_YEAR(): TerminalNode;
     constructor(ctx: DateLiteralContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TableNameContext extends ParserRuleContext {
     STRING_LITERAL(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class IdContext extends ParserRuleContext {
     IDENTIFIER(): TerminalNode | undefined;
     OBJECT_NAME_LITERAL(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class TimeframeContext extends ParserRuleContext {
     SECOND(): TerminalNode | undefined;
@@ -1443,18 +1442,18 @@ export declare class TimeframeContext extends ParserRuleContext {
     YEAR(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class UngroupContext extends ParserRuleContext {
     ALL(): TerminalNode | undefined;
     EXCLUDE(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldExprContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1464,9 +1463,9 @@ export declare class FieldExprContext extends ParserRuleContext {
 export declare class ExprFieldPathContext extends FieldExprContext {
     fieldPath(): FieldPathContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprFilterContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
@@ -1474,50 +1473,50 @@ export declare class ExprFilterContext extends FieldExprContext {
     filteredBy(): FilteredByContext;
     CCURLY(): TerminalNode;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprLiteralContext extends FieldExprContext {
     literal(): LiteralContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprMinusContext extends FieldExprContext {
     MINUS(): TerminalNode;
     fieldExpr(): FieldExprContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprDurationContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
     timeframe(): TimeframeContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprTimeTruncContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
     DOT(): TerminalNode;
     timeframe(): TimeframeContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprSafeCastContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
     DOUBLECOLON(): TerminalNode;
     malloyType(): MalloyTypeContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprMulDivContext extends FieldExprContext {
     fieldExpr(): FieldExprContext[];
@@ -1525,9 +1524,9 @@ export declare class ExprMulDivContext extends FieldExprContext {
     STAR(): TerminalNode | undefined;
     SLASH(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprAddSubContext extends FieldExprContext {
     fieldExpr(): FieldExprContext[];
@@ -1535,18 +1534,18 @@ export declare class ExprAddSubContext extends FieldExprContext {
     PLUS(): TerminalNode | undefined;
     MINUS(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprRangeContext extends FieldExprContext {
     fieldExpr(): FieldExprContext[];
     fieldExpr(i: number): FieldExprContext;
     TO(): TerminalNode;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprForRangeContext extends FieldExprContext {
     _startAt: FieldExprContext;
@@ -1556,9 +1555,9 @@ export declare class ExprForRangeContext extends FieldExprContext {
     fieldExpr(): FieldExprContext[];
     fieldExpr(i: number): FieldExprContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprLogicalTreeContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
@@ -1566,18 +1565,18 @@ export declare class ExprLogicalTreeContext extends FieldExprContext {
     AMPER(): TerminalNode | undefined;
     BAR(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprCompareContext extends FieldExprContext {
     fieldExpr(): FieldExprContext[];
     fieldExpr(i: number): FieldExprContext;
     compareOp(): CompareOpContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprApplyContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
@@ -1585,17 +1584,17 @@ export declare class ExprApplyContext extends FieldExprContext {
     COLON(): TerminalNode | undefined;
     QMARK(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprNotContext extends FieldExprContext {
     NOT(): TerminalNode;
     fieldExpr(): FieldExprContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprLogicalContext extends FieldExprContext {
     fieldExpr(): FieldExprContext[];
@@ -1603,9 +1602,9 @@ export declare class ExprLogicalContext extends FieldExprContext {
     AND(): TerminalNode | undefined;
     OR(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprCastContext extends FieldExprContext {
     CAST(): TerminalNode;
@@ -1615,9 +1614,9 @@ export declare class ExprCastContext extends FieldExprContext {
     malloyType(): MalloyTypeContext;
     CPAREN(): TerminalNode;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprCountDisinctContext extends FieldExprContext {
     COUNT(): TerminalNode;
@@ -1626,9 +1625,9 @@ export declare class ExprCountDisinctContext extends FieldExprContext {
     fieldExpr(): FieldExprContext;
     CPAREN(): TerminalNode;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprAggregateContext extends FieldExprContext {
     aggregate(): AggregateContext;
@@ -1639,18 +1638,18 @@ export declare class ExprAggregateContext extends FieldExprContext {
     fieldExpr(): FieldExprContext | undefined;
     STAR(): TerminalNode | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprExprContext extends FieldExprContext {
     OPAREN(): TerminalNode;
     partialAllowedFieldExpr(): PartialAllowedFieldExprContext;
     CPAREN(): TerminalNode;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprFuncContext extends FieldExprContext {
     OPAREN(): TerminalNode;
@@ -1659,16 +1658,16 @@ export declare class ExprFuncContext extends FieldExprContext {
     timeframe(): TimeframeContext | undefined;
     argumentList(): ArgumentListContext | undefined;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprPickContext extends FieldExprContext {
     pickStatement(): PickStatementContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprUngroupContext extends FieldExprContext {
     ungroup(): UngroupContext;
@@ -1680,9 +1679,9 @@ export declare class ExprUngroupContext extends FieldExprContext {
     fieldName(): FieldNameContext[];
     fieldName(i: number): FieldNameContext;
     constructor(ctx: FieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class PartialAllowedFieldExprContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1693,16 +1692,16 @@ export declare class ExprPartialCompareContext extends PartialAllowedFieldExprCo
     compareOp(): CompareOpContext;
     fieldExpr(): FieldExprContext;
     constructor(ctx: PartialAllowedFieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ExprNotPartialContext extends PartialAllowedFieldExprContext {
     fieldExpr(): FieldExprContext;
     constructor(ctx: PartialAllowedFieldExprContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class PickStatementContext extends ParserRuleContext {
     _pickElse: FieldExprContext;
@@ -1712,9 +1711,9 @@ export declare class PickStatementContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class PickContext extends ParserRuleContext {
     _pickValue: FieldExprContext;
@@ -1725,9 +1724,9 @@ export declare class PickContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ArgumentListContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext[];
@@ -1736,9 +1735,9 @@ export declare class ArgumentListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldNameListContext extends ParserRuleContext {
     fieldName(): FieldNameContext[];
@@ -1747,9 +1746,9 @@ export declare class FieldNameListContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldCollectionContext extends ParserRuleContext {
     collectionMember(): CollectionMemberContext[];
@@ -1758,9 +1757,9 @@ export declare class FieldCollectionContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class CollectionMemberContext extends ParserRuleContext {
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1770,9 +1769,9 @@ export declare class CollectionMemberContext extends ParserRuleContext {
 export declare class NameMemberContext extends CollectionMemberContext {
     fieldPath(): FieldPathContext;
     constructor(ctx: CollectionMemberContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class WildMemberContext extends CollectionMemberContext {
     STAR(): TerminalNode | undefined;
@@ -1780,16 +1779,16 @@ export declare class WildMemberContext extends CollectionMemberContext {
     fieldPath(): FieldPathContext | undefined;
     DOT(): TerminalNode | undefined;
     constructor(ctx: CollectionMemberContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class NewMemberContext extends CollectionMemberContext {
     fieldDef(): FieldDefContext;
     constructor(ctx: CollectionMemberContext);
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldPathContext extends ParserRuleContext {
     fieldName(): FieldNameContext[];
@@ -1798,42 +1797,42 @@ export declare class FieldPathContext extends ParserRuleContext {
     DOT(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JoinNameContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class FieldNameContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JustExprContext extends ParserRuleContext {
     fieldExpr(): FieldExprContext;
     EOF(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JsonContext extends ParserRuleContext {
     jsonValue(): JsonValueContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JsonValueContext extends ParserRuleContext {
     JSON_STRING(): TerminalNode | undefined;
@@ -1846,9 +1845,9 @@ export declare class JsonValueContext extends ParserRuleContext {
     NULL(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JsonObjectContext extends ParserRuleContext {
     OCURLY(): TerminalNode;
@@ -1859,9 +1858,9 @@ export declare class JsonObjectContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JsonPropertyContext extends ParserRuleContext {
     JSON_STRING(): TerminalNode;
@@ -1869,9 +1868,9 @@ export declare class JsonPropertyContext extends ParserRuleContext {
     jsonValue(): JsonValueContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class JsonArrayContext extends ParserRuleContext {
     OBRACK(): TerminalNode;
@@ -1882,39 +1881,31 @@ export declare class JsonArrayContext extends ParserRuleContext {
     COMMA(i: number): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
-}
-export declare class SqlBlockContext extends ParserRuleContext {
-    SQL_STRING(): TerminalNode;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SqlExploreNameRefContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class SqlCommandNameDefContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class ConnectionNameContext extends ParserRuleContext {
     JSON_STRING(): TerminalNode;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
-    enterRule(listener: MalloyListener): void;
-    exitRule(listener: MalloyListener): void;
-    accept<Result>(visitor: MalloyVisitor<Result>): Result;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }