@malloydata/malloy 0.0.14 → 0.0.15-dev221208001612

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

@@ -1,6 +1,4 @@
 import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
-import { ExprPartialCompareContext } from "./MalloyParser";
-import { ExprNotPartialContext } from "./MalloyParser";
 import { NameMemberContext } from "./MalloyParser";
 import { WildMemberContext } from "./MalloyParser";
 import { NewMemberContext } from "./MalloyParser";
@@ -177,30 +175,6 @@ import { ConnectionNameContext } from "./MalloyParser";
  * `MalloyParser`.
  */
 export interface MalloyParserListener extends ParseTreeListener {
-    /**
-     * Enter a parse tree produced by the `exprPartialCompare`
-     * labeled alternative in `MalloyParser.partialAllowedFieldExpr`.
-     * @param ctx the parse tree
-     */
-    enterExprPartialCompare?: (ctx: ExprPartialCompareContext) => void;
-    /**
-     * Exit a parse tree produced by the `exprPartialCompare`
-     * labeled alternative in `MalloyParser.partialAllowedFieldExpr`.
-     * @param ctx the parse tree
-     */
-    exitExprPartialCompare?: (ctx: ExprPartialCompareContext) => void;
-    /**
-     * Enter a parse tree produced by the `exprNotPartial`
-     * labeled alternative in `MalloyParser.partialAllowedFieldExpr`.
-     * @param ctx the parse tree
-     */
-    enterExprNotPartial?: (ctx: ExprNotPartialContext) => void;
-    /**
-     * Exit a parse tree produced by the `exprNotPartial`
-     * labeled alternative in `MalloyParser.partialAllowedFieldExpr`.
-     * @param ctx the parse tree
-     */
-    exitExprNotPartial?: (ctx: ExprNotPartialContext) => void;
     /**
      * Enter a parse tree produced by the `nameMember`
      * labeled alternative in `MalloyParser.collectionMember`.

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

@@ -1,6 +1,4 @@
 import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
-import { ExprPartialCompareContext } from "./MalloyParser";
-import { ExprNotPartialContext } from "./MalloyParser";
 import { NameMemberContext } from "./MalloyParser";
 import { WildMemberContext } from "./MalloyParser";
 import { NewMemberContext } from "./MalloyParser";
@@ -180,20 +178,6 @@ import { ConnectionNameContext } from "./MalloyParser";
  * operations with no return type.
  */
 export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
-    /**
-     * Visit a parse tree produced by the `exprPartialCompare`
-     * labeled alternative in `MalloyParser.partialAllowedFieldExpr`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExprPartialCompare?: (ctx: ExprPartialCompareContext) => Result;
-    /**
-     * Visit a parse tree produced by the `exprNotPartial`
-     * labeled alternative in `MalloyParser.partialAllowedFieldExpr`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExprNotPartial?: (ctx: ExprNotPartialContext) => Result;
     /**
      * Visit a parse tree produced by the `nameMember`
      * labeled alternative in `MalloyParser.collectionMember`.

package/dist/lang/parse-to-ast.d.ts

@@ -114,8 +114,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     allFieldExpressions(exprList: parse.FieldExprContext[]): ast.ExpressionDef[];
     visitExprLogical(pcx: parse.ExprLogicalContext): ast.ExprLogicalOp;
     visitExprLogicalTree(pcx: parse.ExprLogicalTreeContext): ast.ExprAlternationTree;
-    visitExprNotPartial(pcx: parse.ExprNotPartialContext): ast.ExpressionDef;
-    visitExprPartialCompare(pcx: parse.ExprPartialCompareContext): ast.MalloyElement;
+    visitPartialAllowedFieldExpr(pcx: parse.PartialAllowedFieldExprContext): ast.ExpressionDef;
     visitExprString(pcx: parse.ExprStringContext): ast.ExprString;
     visitExprRegex(pcx: parse.ExprRegexContext): ast.ExprRegEx;
     visitExprNow(_pcx: parse.ExprNowContext): ast.ExprNow;

package/dist/lang/parse-to-ast.js

@@ -686,15 +686,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const right = this.getFieldExpr(pcx.partialAllowedFieldExpr());
         return new ast.ExprAlternationTree(left, pcx.AMPER() ? "&" : "|", right);
     }
-    visitExprNotPartial(pcx) {
-        return this.getFieldExpr(pcx.fieldExpr());
-    }
-    visitExprPartialCompare(pcx) {
-        const op = pcx.compareOp().text;
-        if (ast.isComparison(op)) {
-            return new ast.PartialCompare(op, this.getFieldExpr(pcx.fieldExpr()));
+    visitPartialAllowedFieldExpr(pcx) {
+        var _a;
+        const fieldExpr = this.getFieldExpr(pcx.fieldExpr());
+        const partialOp = (_a = pcx.compareOp()) === null || _a === void 0 ? void 0 : _a.text;
+        if (partialOp) {
+            if (ast.isComparison(partialOp)) {
+                return this.astAt(new ast.PartialCompare(partialOp, fieldExpr), pcx);
+            }
+            throw this.internalError(pcx, `partial comparison '${partialOp}' not recognized`);
         }
-        throw this.internalError(pcx, `partial comparison '${op}' not recognized`);
+        return fieldExpr;
     }
     visitExprString(pcx) {
         return new ast.ExprString(pcx.STRING_LITERAL().text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.14",
+  "version": "0.0.15-dev221208001612",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",