remove m4 filter shortcut

malloydata · Oct 29, 2024 · 8943574 · 8943574
1 parent 337cdd2
commit 8943574
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/packages/malloy/src/lang/grammar/MalloyParser.g4 b/packages/malloy/src/lang/grammar/MalloyParser.g4
@@ -133,12 +133,7 @@ connectionId
   : id;
 
 queryProperties
-  : filterShortcut
-  | OCURLY (queryStatement | SEMI)* closeCurly
-  ;
-
-filterShortcut
-  : OCURLY QMARK fieldExpr closeCurly
+  : OCURLY (queryStatement | SEMI)* closeCurly
   ;
 
 queryName : id;
@@ -169,7 +164,6 @@ sourceNameDef: id;
 
 exploreProperties
   : OCURLY (exploreStatement | SEMI)* closeCurly
-  | filterShortcut
   ;
 
 exploreStatement

diff --git a/packages/malloy/src/lang/malloy-to-ast.ts b/packages/malloy/src/lang/malloy-to-ast.ts
@@ -280,16 +280,6 @@ export class MalloyToAST
     );
   }
 
-  protected getFilterShortcut(cx: parse.FilterShortcutContext): ast.Filter {
-    const el = this.getFilterElement(cx.fieldExpr());
-    this.m4advisory(
-      cx,
-      'filter-shortcut',
-      'Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead'
-    );
-    return new ast.Filter([el]);
-  }
-
   protected getPlainStringFrom(cx: HasString): string {
     const [result, errors] = getPlainString(cx);
     for (const error of errors) {
@@ -442,16 +432,12 @@ export class MalloyToAST
   }
 
   visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.SourceDesc {
-    const filterCx = pcx.filterShortcut();
     const visited = this.only<ast.SourceProperty>(
       pcx.exploreStatement().map(ecx => this.visit(ecx)),
       x => ast.isSourceProperty(x) && x,
       'source property'
     );
     const propList = new ast.SourceDesc(visited);
-    if (filterCx) {
-      propList.push(this.getFilterShortcut(filterCx));
-    }
     return propList;
   }
 
@@ -804,10 +790,6 @@ export class MalloyToAST
       x => ast.isQueryProperty(x) && x,
       'query statement'
     );
-    const fcx = pcx.filterShortcut();
-    if (fcx) {
-      qProps.push(this.getFilterShortcut(fcx));
-    }
     return new ast.QOpDesc(qProps);
   }
 

diff --git a/packages/malloy/src/lang/parse-log.ts b/packages/malloy/src/lang/parse-log.ts
@@ -319,7 +319,6 @@ type MessageParameterTypes = {
   'foreign-key-in-join-cross': string;
   'expression-type-error': string;
   'unexpected-statement-in-translation': string;
-  'filter-shortcut': string;
   'illegal-query-interpolation-outside-sql-block': string;
   'percent-terminated-query-interpolation': string;
   'failed-to-parse-time-literal': string;