summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-02-21 10:55:05 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-02-21 10:55:05 +0100
commit523b84d4328c9e6ff6fc80c4319176bceb5865f9 (patch)
treee9b2d2da7c8719d3b71df9add76c6e83b8b08e31
parent4e9f017ea7a05061e34dd14c28be93905cad1ada (diff)
downloadgitlab-ce-523b84d4328c9e6ff6fc80c4319176bceb5865f9.tar.gz
Move pipeline expressions grammar from lexer to parser
-rw-r--r--lib/gitlab/ci/pipeline/expression/lexer.rb8
-rw-r--r--lib/gitlab/ci/pipeline/expression/statement.rb8
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/gitlab/ci/pipeline/expression/lexer.rb b/lib/gitlab/ci/pipeline/expression/lexer.rb
index 62645659088..2734ef34c06 100644
--- a/lib/gitlab/ci/pipeline/expression/lexer.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexer.rb
@@ -2,14 +2,6 @@ module Gitlab
module Ci
module Pipeline
module Expression
- GRAMMAR = [
- %w[variable equals string],
- %w[variable equals variable],
- %w[variable equals null],
- %w[string equals variable],
- %w[null equals variable],
- ]
-
class Lexer
def initialize(statement)
@statement = statement
diff --git a/lib/gitlab/ci/pipeline/expression/statement.rb b/lib/gitlab/ci/pipeline/expression/statement.rb
index e6c93288166..aea6dc3f959 100644
--- a/lib/gitlab/ci/pipeline/expression/statement.rb
+++ b/lib/gitlab/ci/pipeline/expression/statement.rb
@@ -3,6 +3,14 @@ module Gitlab
module Pipeline
module Expression
class Statement
+ GRAMMAR = [
+ %w[variable equals string],
+ %w[variable equals variable],
+ %w[variable equals null],
+ %w[string equals variable],
+ %w[null equals variable],
+ ]
+
def initialize(pipeline, statement)
@pipeline = pipeline
@statement = statement