rgviz 0.35 → 0.36

data/lib/rgviz/lexer.rb

@@ -118,7 +118,14 @@ module Rgviz
           case c! when 'o', 'O'
             case c!
             when 'n', 'N'
-              case c! when 't', 'T'
+              case c!
+              when 'c', 'C'
+                case c! when 'a', 'A'
+                  case c! when 't', 'T'
+                    return keyword(Token::Concat) if end_of_identifier!
+                  end
+                end
+              when 't', 'T'
                 case c! when 'a', 'A'
                   case c! when 'i', 'I'
                     case c! when 'n', 'N'

data/lib/rgviz/nodes.rb

@@ -384,6 +384,7 @@ module Rgviz
 
   class ScalarFunctionColumn
 
+    Concat = Token::Concat
     DateDiff = Token::DateDiff
     Day = Token::Day
     DayOfWeek = Token::DayOfWeek

data/lib/rgviz/parser.rb

@@ -383,7 +383,7 @@ module Rgviz
       when Token::Year, Token::Month, Token::Day, 
            Token::Hour, Token::Minute, Token::Second, Token::Millisecond,
            Token::Now, Token::DateDiff, Token::Lower, Token::Upper,
-           Token::Quarter, Token::DayOfWeek, Token::ToDate
+           Token::Quarter, Token::DayOfWeek, Token::ToDate, Token::Concat
         function = @token.value
         string = @token.string
         next_token

data/lib/rgviz/token.rb

@@ -5,6 +5,7 @@ module Rgviz
     Asc = :asc
     Avg = :avg
     By = :by
+    Concat = :concat
     Contains = :contains
     Count = :count
     Desc = :desc

data/spec/rgviz/lexer_spec.rb

@@ -83,6 +83,7 @@ describe Lexer do
   it_lexes_keyword 'asc', Token::Asc
   it_lexes_keyword 'avg', Token::Avg
   it_lexes_keyword 'by', Token::By
+  it_lexes_keyword 'concat', Token::Concat
   it_lexes_keyword 'contains', Token::Contains
   it_lexes_keyword 'count', Token::Count
   it_lexes_keyword 'date', Token::Date

data/spec/rgviz/parser_spec.rb

@@ -199,7 +199,8 @@ describe Parser do
     ['upper', ScalarFunctionColumn::Upper],
     ['quarter', ScalarFunctionColumn::Quarter],
     ['dayofweek', ScalarFunctionColumn::DayOfWeek],
-    ['todate', ScalarFunctionColumn::ToDate]
+    ['todate', ScalarFunctionColumn::ToDate],
+    ['concat', ScalarFunctionColumn::Concat],
   ].each do |str, function|
     it "parses #{str} function" do
       col = parse_select_single_column "#{str}(col)" 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 67
   prerelease: false
   segments: 
   - 0
-  - 35
-  version: "0.35"
+  - 36
+  version: "0.36"
 platform: ruby
 authors: 
 - Ary Borenszweig