From 523b84d4328c9e6ff6fc80c4319176bceb5865f9 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 21 Feb 2018 10:55:05 +0100
Subject: Move pipeline expressions grammar from lexer to parser

---
 lib/gitlab/ci/pipeline/expression/lexer.rb     | 8 --------
 lib/gitlab/ci/pipeline/expression/statement.rb | 8 ++++++++
 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
-- 
cgit v1.2.1