diff --git a/src/ol/expression/lexer.js b/src/ol/expression/lexer.js index cf2ddd42b2..9dbbb2afc3 100644 --- a/src/ol/expression/lexer.js +++ b/src/ol/expression/lexer.js @@ -1,4 +1,5 @@ goog.provide('ol.expression.Lexer'); +goog.provide('ol.expression.TokenType'); goog.require('goog.asserts'); diff --git a/test/spec/ol/expression/lexer.test.js b/test/spec/ol/expression/lexer.test.js index 42d4bc3867..89f37614d5 100644 --- a/test/spec/ol/expression/lexer.test.js +++ b/test/spec/ol/expression/lexer.test.js @@ -19,36 +19,43 @@ describe('ol.expression.Lexer', function() { it('works for integers', function() { var token = scan('123'); expect(token.value).to.be(123); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); it('works for float', function() { var token = scan('123.456'); expect(token.value).to.be(123.456); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); it('works with exponent', function() { var token = scan('1.234e5'); expect(token.value).to.be(1.234e5); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); it('works with explicit positive exponent', function() { var token = scan('1.234e+5'); expect(token.value).to.be(1.234e5); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); it('works with negative exponent', function() { var token = scan('1.234e-5'); expect(token.value).to.be(1.234e-5); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); it('works with octals', function() { var token = scan('02322'); expect(token.value).to.be(1234); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); it('works with hex', function() { var token = scan('0x4d2'); expect(token.value).to.be(1234); + expect(token.type).to.be(ol.expression.TokenType.NUMERIC_LITERAL); }); }); @@ -56,3 +63,4 @@ describe('ol.expression.Lexer', function() { }); goog.require('ol.expression.Lexer'); +goog.require('ol.expression.TokenType');