From e6498efe0af5537ec4bd3cb3251030e8917d06e6 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 21 Feb 2018 14:17:01 +0100 Subject: Make pipeline variables evaluation concept explicit --- lib/gitlab/ci/pipeline/expression/statement.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/ci/pipeline/expression/statement.rb b/lib/gitlab/ci/pipeline/expression/statement.rb index 069e0ad91f7..35c3bb20608 100644 --- a/lib/gitlab/ci/pipeline/expression/statement.rb +++ b/lib/gitlab/ci/pipeline/expression/statement.rb @@ -17,13 +17,11 @@ module Gitlab def initialize(statement, pipeline) @pipeline = pipeline @lexer = Expression::Lexer.new(statement) - end - - def variables + @variables = pipeline.variables # TODO end def tokens - @lexer.tokenize + @tokens ||= @lexer.tokenize end def lexemes @@ -50,7 +48,7 @@ module Gitlab end def evaluate - parse_tree.evaluate # evaluate(variables) + parse_tree.evaluate(**@variables) end end end -- cgit v1.2.1