8 files changed, 36 insertions, 10 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb b/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb
index 0cb21131d69..b499d41a509 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/equals.rb
@@ -3,9 +3,8 @@ module Gitlab
     module Pipeline
       module Expression
         module Lexeme
-          class Equals < Lexeme::Base
+          class Equals < Lexeme::Operator
             PATTERN = /==/.freeze
-            TYPE = :operator
 
             def initialize(left, right)
               @left = left
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/null.rb b/lib/gitlab/ci/pipeline/expression/lexeme/null.rb
index 21286151d79..5bf06a9eee2 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/null.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/null.rb
@@ -3,9 +3,8 @@ module Gitlab
     module Pipeline
       module Expression
         module Lexeme
-          class Null < Lexeme::Base
+          class Null < Lexeme::Value
             PATTERN = /null/.freeze
-            TYPE = :value
 
             def initialize(value = nil)
               @value = value
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/operator.rb b/lib/gitlab/ci/pipeline/expression/lexeme/operator.rb
new file mode 100644
index 00000000000..f640d0b5855
--- /dev/null
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/operator.rb
@@ -0,0 +1,15 @@
+module Gitlab
+  module Ci
+    module Pipeline
+      module Expression
+        module Lexeme
+          class Operator < Lexeme::Base
+            def self.type
+              :operator
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
index 470a5a15cc1..6f77d443c3c 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
@@ -3,9 +3,8 @@ module Gitlab
     module Pipeline
       module Expression
         module Lexeme
-          class String < Lexeme::Base
+          class String < Lexeme::Value
             PATTERN = /"(?<string>.+?)"/.freeze
-            TYPE = :value
 
             def initialize(value)
               @value = value
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/value.rb b/lib/gitlab/ci/pipeline/expression/lexeme/value.rb
new file mode 100644
index 00000000000..f2611d65faf
--- /dev/null
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/value.rb
@@ -0,0 +1,15 @@
+module Gitlab
+  module Ci
+    module Pipeline
+      module Expression
+        module Lexeme
+          class Value < Lexeme::Base
+            def self.type
+              :value
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb b/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb
index 5fb5dd4bbbe..01eea6b19a6 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/variable.rb
@@ -3,9 +3,8 @@ module Gitlab
     module Pipeline
       module Expression
         module Lexeme
-          class Variable < Lexeme::Base
+          class Variable < Lexeme::Value
             PATTERN = /\$(?<name>\w+)/.freeze
-            TYPE = :value
 
             def initialize(name)
               @name = name
diff --git a/lib/gitlab/ci/pipeline/expression/lexer.rb b/lib/gitlab/ci/pipeline/expression/lexer.rb
index 038c0e7e330..a0d1d7cd87d 100644
--- a/lib/gitlab/ci/pipeline/expression/lexer.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexer.rb
@@ -10,7 +10,7 @@ module Gitlab
           ].freeze
 
           MAX_CYCLES = 5
-          SyntaxError = Class.new(StandardError)
+          SyntaxError = Class.new(Statement::StatementError)
 
           def initialize(statement)
             @scanner = StringScanner.new(statement)
diff --git a/lib/gitlab/ci/pipeline/expression/parser.rb b/lib/gitlab/ci/pipeline/expression/parser.rb
index b395e4692f1..1f6a3602b31 100644
--- a/lib/gitlab/ci/pipeline/expression/parser.rb
+++ b/lib/gitlab/ci/pipeline/expression/parser.rb
@@ -22,7 +22,7 @@ module Gitlab
               end
             end
           rescue StopIteration
-            @nodes.last || Expression::Lexeme::Null.new
+            @nodes.last || Lexeme::Null.new
           end
 
           def self.seed(statement)