diff --git a/lib/gitlab/ci/pipeline/expression/equals.rb b/lib/gitlab/ci/pipeline/expression/equals.rb index 8466891f66a5359adcb41f9a2805c6c4b5e815ce..46b8ebb63e3650e88707ac328843a4332fa6e4e8 100644 --- a/lib/gitlab/ci/pipeline/expression/equals.rb +++ b/lib/gitlab/ci/pipeline/expression/equals.rb @@ -2,7 +2,7 @@ module Gitlab module Ci module Pipeline module Expression - class Equals < Expression::Token + class Equals < Expression::Lexeme PATTERN = /==/.freeze def initialize(left, right) diff --git a/lib/gitlab/ci/pipeline/expression/token.rb b/lib/gitlab/ci/pipeline/expression/lexeme.rb similarity index 72% rename from lib/gitlab/ci/pipeline/expression/token.rb rename to lib/gitlab/ci/pipeline/expression/lexeme.rb index bf28191a6453f814e158e54aef63042ebfdfa672..3651f8eab957946c74b17a3493be59c00a7864ae 100644 --- a/lib/gitlab/ci/pipeline/expression/token.rb +++ b/lib/gitlab/ci/pipeline/expression/lexeme.rb @@ -2,15 +2,11 @@ module Gitlab module Ci module Pipeline module Expression - class Token + class Lexeme def evaluate(**variables) raise NotImplementedError end - def self.build(string) - raise NotImplementedError - end - def self.scan(scanner) scanner.scan(PATTERN) end diff --git a/lib/gitlab/ci/pipeline/expression/null.rb b/lib/gitlab/ci/pipeline/expression/null.rb index d33f0bffc48c340a796e4976e200e1e2b488c4bf..ae5ab7f37d038ec281ac1ec0fb37f9bd3666147d 100644 --- a/lib/gitlab/ci/pipeline/expression/null.rb +++ b/lib/gitlab/ci/pipeline/expression/null.rb @@ -2,7 +2,7 @@ module Gitlab module Ci module Pipeline module Expression - class Null < Expression::Token + class Null < Expression::Lexeme PATTERN = /null/.freeze def initialize(value) diff --git a/lib/gitlab/ci/pipeline/expression/string.rb b/lib/gitlab/ci/pipeline/expression/string.rb index d8d6155f431ec854ac50f65e6ef0e04776ec2da9..a603ef6cf4c2693407142c576444f651648a9c58 100644 --- a/lib/gitlab/ci/pipeline/expression/string.rb +++ b/lib/gitlab/ci/pipeline/expression/string.rb @@ -2,7 +2,7 @@ module Gitlab module Ci module Pipeline module Expression - class String < Expression::Token + class String < Expression::Lexeme PATTERN = /("|')(?<value>.+)('|")/.freeze def initialize(value) diff --git a/lib/gitlab/ci/pipeline/expression/variable.rb b/lib/gitlab/ci/pipeline/expression/variable.rb index d22566c61a8b2532210d29412cb71c3d76abb2c9..3ae2291fb1ed19f6d224ef8ea55538e9542472f2 100644 --- a/lib/gitlab/ci/pipeline/expression/variable.rb +++ b/lib/gitlab/ci/pipeline/expression/variable.rb @@ -2,7 +2,7 @@ module Gitlab module Ci module Pipeline module Expression - class Equality < Expression::Token + class Equality < Expression::Lexeme PATTERN = /$(?<name>\w+)/.freeze def initialize(value)