@malloydata/malloy
Advanced tools
Comparing version 0.0.12-dev221204204332 to 0.0.12-dev221204205211
@@ -39,3 +39,3 @@ "use strict"; | ||
} | ||
if (oneOf(op, "*")) { | ||
if (oneOf(op, "*", "%")) { | ||
return numeric(fs, left, op, right); | ||
@@ -42,0 +42,0 @@ } |
@@ -164,3 +164,3 @@ import { By, AtomicFieldType, FieldTypeDef, Fragment, TimeFieldType } from "../../model/malloy_types"; | ||
} | ||
export declare class ExprMulDiv extends BinaryNumeric<"*" | "/"> { | ||
export declare class ExprMulDiv extends BinaryNumeric<"*" | "/" | "%"> { | ||
elementType: string; | ||
@@ -167,0 +167,0 @@ } |
@@ -492,3 +492,3 @@ "use strict"; | ||
super(...arguments); | ||
this.elementType = "*/"; | ||
this.elementType = "*/%"; | ||
} | ||
@@ -495,0 +495,0 @@ } |
@@ -122,22 +122,23 @@ import { ATN } from "antlr4ts/atn/ATN"; | ||
static readonly MATCH = 116; | ||
static readonly LITERAL_TIMESTAMP = 117; | ||
static readonly LITERAL_DAY = 118; | ||
static readonly LITERAL_QUARTER = 119; | ||
static readonly LITERAL_MONTH = 120; | ||
static readonly LITERAL_WEEK = 121; | ||
static readonly LITERAL_YEAR = 122; | ||
static readonly IDENTIFIER = 123; | ||
static readonly PERCENT_LITERAL = 124; | ||
static readonly INTEGER_LITERAL = 125; | ||
static readonly NUMERIC_LITERAL = 126; | ||
static readonly OBJECT_NAME_LITERAL = 127; | ||
static readonly BLOCK_COMMENT = 128; | ||
static readonly COMMENT_TO_EOL = 129; | ||
static readonly WHITE_SPACE = 130; | ||
static readonly SQL_BEGIN = 131; | ||
static readonly CLOSE_CODE = 132; | ||
static readonly UNWATED_CHARS_TRAILING_NUMBERS = 133; | ||
static readonly UNEXPECTED_CHAR = 134; | ||
static readonly OPEN_CODE = 135; | ||
static readonly SQL_END = 136; | ||
static readonly PERCENT = 117; | ||
static readonly LITERAL_TIMESTAMP = 118; | ||
static readonly LITERAL_DAY = 119; | ||
static readonly LITERAL_QUARTER = 120; | ||
static readonly LITERAL_MONTH = 121; | ||
static readonly LITERAL_WEEK = 122; | ||
static readonly LITERAL_YEAR = 123; | ||
static readonly IDENTIFIER = 124; | ||
static readonly PERCENT_LITERAL = 125; | ||
static readonly INTEGER_LITERAL = 126; | ||
static readonly NUMERIC_LITERAL = 127; | ||
static readonly OBJECT_NAME_LITERAL = 128; | ||
static readonly BLOCK_COMMENT = 129; | ||
static readonly COMMENT_TO_EOL = 130; | ||
static readonly WHITE_SPACE = 131; | ||
static readonly SQL_BEGIN = 132; | ||
static readonly CLOSE_CODE = 133; | ||
static readonly UNWATED_CHARS_TRAILING_NUMBERS = 134; | ||
static readonly UNEXPECTED_CHAR = 135; | ||
static readonly OPEN_CODE = 136; | ||
static readonly SQL_END = 137; | ||
static readonly SQL_MODE = 1; | ||
@@ -144,0 +145,0 @@ static readonly channelNames: string[]; |
@@ -744,3 +744,4 @@ "use strict"; | ||
visitExprMulDiv(pcx) { | ||
return new ast.ExprMulDiv(this.getFieldExpr(pcx.fieldExpr(0)), pcx.STAR() ? "*" : "/", this.getFieldExpr(pcx.fieldExpr(1))); | ||
const op = pcx.STAR() ? "*" : pcx.SLASH() ? "/" : "%"; | ||
return new ast.ExprMulDiv(this.getFieldExpr(pcx.fieldExpr(0)), op, this.getFieldExpr(pcx.fieldExpr(1))); | ||
} | ||
@@ -747,0 +748,0 @@ visitExprCompare(pcx) { |
{ | ||
"name": "@malloydata/malloy", | ||
"version": "0.0.12-dev221204204332", | ||
"version": "0.0.12-dev221204205211", | ||
"license": "GPL-2.0", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1582796
41186
2