summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-02-21 10:53:37 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-02-21 10:53:37 +0100
commit4e9f017ea7a05061e34dd14c28be93905cad1ada (patch)
tree46f6816e51ab9c43fccc95fa912cb68ef8795bf5
parent2125d6fa0292a0782d1d4ef18661eed5c1517579 (diff)
downloadgitlab-ce-4e9f017ea7a05061e34dd14c28be93905cad1ada.tar.gz
Rename tokens to lexemes in pipeline expressions
-rw-r--r--lib/gitlab/ci/pipeline/expression/equals.rb2
-rw-r--r--lib/gitlab/ci/pipeline/expression/lexeme.rb (renamed from lib/gitlab/ci/pipeline/expression/token.rb)6
-rw-r--r--lib/gitlab/ci/pipeline/expression/null.rb2
-rw-r--r--lib/gitlab/ci/pipeline/expression/string.rb2
-rw-r--r--lib/gitlab/ci/pipeline/expression/variable.rb2
5 files changed, 5 insertions, 9 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/equals.rb b/lib/gitlab/ci/pipeline/expression/equals.rb
index 8466891f66a..46b8ebb63e3 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
index bf28191a645..3651f8eab95 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 d33f0bffc48..ae5ab7f37d0 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 d8d6155f431..a603ef6cf4c 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 d22566c61a8..3ae2291fb1e 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)