qlang 0.0.27000000 → 0.0.27100000

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e53219836ec42b6ef2edb577c24f402f97e49c
-  data.tar.gz: 2cf73154711705aa6b29b1da703b06638f37c01b
+  metadata.gz: dcf745e14a6861e5e9fb6c4910d8df2ba4e5f3f9
+  data.tar.gz: 297ae46f6a7a43efc30ad3225c919a34ea251244
 SHA512:
-  metadata.gz: 1b1a074dec18140414233546d87d3de94c5ac22524054be77cac955a47ec7ba1f05069a84c63dc88275f0eeb09b5e5c1ba61436aef9d18a34e93cc764077dca7
-  data.tar.gz: f23ae787a6fdcdf7a70e992dfa8db9e51e5f08f24dfdaa9db86f1ef0b3899478afb5ec5818325d68bdb517e45b1f0258e42326c24dc5c607c6784e7e067db588
+  metadata.gz: 9ff8c82a7f9711d3a2af78e50821aa03399fd38859925edb683dfa4883a2551a7cf4cf4a45a8543bf22969d413abc7e564c4311683b64201642d339efc186e55
+  data.tar.gz: 1f1322071f77fa070ced62cc7581bd50315d7408f91bd59585316608d13c72f50defb81e1f10b29c9db338481815712ea21b5bad0685033a9827cb476b10a22f

data/bin/qlang

@@ -2,7 +2,8 @@
 require 'qlang'
 include Qlang
 
-case ARGV.shift
+# TODO: There are vanch of todo ..
+case ARGV.first
 when '-i'
   loop do
     print 'Q:-> '
@@ -14,7 +15,7 @@ when '-i'
       puts e
     end
   end
-when '-c'
-  compiler = Qlang::Exec::Compiler.new(ARGV)
-  compiler.parse!
+when '-R', '-Ruby'
+  exec = Qlang::Exec::Compiler.new(ARGV)
+  exec.output!
 end

data/core/Q/Lexer.hs

@@ -0,0 +1,9 @@
+{- |
+Module      : Language.Q
+Copyright   : Kazuki Tanaka (a.k.a gogotanaka)
+Licence     : MIT
+
+q-language.org.
+-}
+
+module Q.Lexer where

data/core/Q/Parser.hs

@@ -0,0 +1,9 @@
+{- |
+Module      : Language.Q
+Copyright   : Kazuki Tanaka (a.k.a gogotanaka)
+Licence     : MIT
+
+q-language.org.
+-}
+
+module Q.Parser where

data/core/Q.hs

@@ -0,0 +1,19 @@
+{- |
+Module      : Language.Q
+Copyright   : Kazuki Tanaka (a.k.a gogotanaka)
+Licence     : MIT
+
+q-language.org.
+-}
+
+module Q
+       ( module Q.Lexer
+       , module Q.Parser
+       , version
+       ) where
+
+
+import Q.Lexer
+import Q.Parser
+
+import Data.Version

data/lib/qlang/exec.rb

@@ -5,9 +5,11 @@ module Qlang
         @args = args
       end
 
-      def parse!
-        ch_compile_type(ARGV.shift)
-        parse
+      def output!
+        ch_compile_type(@args.first)
+        parse_string = parse(@args[1])
+        write!(@args[2], parse_string)
+
       rescue Exception => e
         raise e if @options[:trace] || e.is_a?(SystemExit)
 
@@ -28,17 +30,21 @@ module Qlang
           when '-R'
             Qlang.to_r
           else
-            print 'Q support Ruby and R now.'
+            print 'Q support only Ruby and R now.'
           end
         end
 
-        def parse
-          raise '#{@args[0]} is unsupported option' unless @args[0] == '-q'
-          filename = @args[1]
-          file = open_file(filename)
-          string = read_file(file)
-          print(Kconv.tosjis(Qlang.compile(string)), '\n')
+        def parse(file_path)
+          file = open_file(file_path)
+          input_string = read_file(file)
           file.close
+          Kconv.tosjis(Qlang.compile(input_string))
+        end
+
+        def write!(output_path, string)
+          open(output_path, 'w') do |f|
+            f.puts string
+          end
         end
 
         def open_file(filename, flag = 'r')

data/lib/qlang/lexer/tokens.rb

@@ -32,7 +32,7 @@ module Qlang
       # THIRD TOKEN
       class ::String
         def func_call
-          "#{FUNCV}#{LPRN}#{ANYSP}#{self}*#{ANYSP}#{RPRN}"
+          "#{FUNCV}#{LPRN}#{ANYSP}#{self}#{ANYSP}#{RPRN}"
         end
       end
       FUNCCN =  NUMS_BY_CMA.func_call

data/lib/qlang/version.rb

@@ -1,3 +1,3 @@
 module Qlang
-  VERSION = "0.0.27000000"
+  VERSION = "0.0.27100000"
 end

data/spec/langs/R/ex1_after.R

@@ -0,0 +1,89 @@
+if (base::getRversion() >= "2.15.1") {
+  utils::globalVariables(c("county.fips", "long", "lat", "group", "value", "label", "zipcode", "longitude", "latitude", "value"))
+}
+
+bind_df_to_zip_map = function(df)
+{
+  stopifnot(c("region", "value") %in% colnames(df))
+  df = rename(df, replace=c("region" = "zip"))
+
+  data(zipcode, package="zipcode", envir=environment())
+  choropleth = merge(zipcode, df, all.x=F, all.y=T);
+
+  choropleth = choropleth[choropleth$longitude < -10, ]
+}
+
+print_zip_choropleth = function(choropleth.df, states, scaleName, theme, min, max)
+{
+  stopifnot(states %in% state.abb)
+
+  a = (1 3 4)
+
+  state.df = subset_map("state", states)
+  colnames(state.df)[names(state.df) == "long"] = "longitude"
+  colnames(state.df)[names(state.df) == "lat"]  = "latitude"
+  state.df = arrange(state.df, group, order);
+
+  if (is.numeric(choropleth.df$value))
+  {
+    ggplot(choropleth.df, aes(x=longitude, y=latitude, color=value)) +
+      geom_point() +
+      scale_color_continuous(scaleName, labels=comma) +
+      geom_polygon(data = state.df, color = "black", fill = NA, size = 0.2, aes(group=group)) +
+      theme;
+  } else {
+    stopifnot(length(unique(na.omit(choropleth.df$value))) <= 9)
+    ggplot(choropleth.df, aes(x=longitude, y=latitude, color=value)) +
+      geom_point() +
+      scale_colour_brewer(scaleName, labels=comma) +
+      geom_polygon(data = state.df, color = "black", fill = NA, size = 0.2, aes(group=group)) +
+      theme;
+  }
+}
+
+render_zip_choropleth = function(choropleth.df, title="", scaleName="", states=state.abb, renderAsInsets=TRUE)
+{
+  choropleth.df = choropleth.df[choropleth.df$state %in% states, ]
+
+  min_val = 0
+  max_val = 0
+  if (is.numeric(choropleth.df$value))
+  {
+    min_val = min(choropleth.df$value)
+    max_val = max(choropleth.df$value)
+  }
+
+  if (length(states) == length(state.abb) &&
+        states == state.abb &&
+        renderAsInsets)
+  {
+    alaska.df     = choropleth.df[choropleth.df$state=="AK",]
+    alaska.ggplot = print_zip_choropleth(alaska.df, "AK", "", theme_inset(), min_val, max_val)
+    alaska.grob   = ggplotGrob(alaska.ggplot)
+
+    hawaii.df     = choropleth.df[choropleth.df$state=="HI",]
+    hawaii.ggplot = print_zip_choropleth(hawaii.df, "HI", "", theme_inset(), min_val, max_val)
+    hawaii.grob   = ggplotGrob(hawaii.ggplot)
+
+    choropleth.df = choropleth.df[!choropleth.df$state %in% c("AK", "HI"), ]
+    choropleth = print_zip_choropleth(choropleth.df, setdiff(state.abb, c("AK", "HI")), scaleName, theme_clean(), min_val, max_val) + ggtitle(title)
+
+    choropleth = choropleth +
+      annotation_custom(grobTree(hawaii.grob), xmin=-107.5, xmax=-102.5, ymin=25, ymax=27.5) +
+      annotation_custom(grobTree(alaska.grob), xmin=-125, xmax=-110, ymin=22.5, ymax=30)
+
+  } else {
+    choropleth = print_zip_choropleth(choropleth.df, states, scaleName, theme_clean(), min_val, max_val) + ggtitle(title)
+  }
+
+  choropleth
+}
+
+zip_choropleth_auto = function(df, num_buckets = 9, title = "", scaleName = "", states, renderAsInsets)
+{
+  df = clip_df(df, "zip", states)
+  df = discretize_df(df, num_buckets)
+
+  choropleth.df = bind_df_to_zip_map(df)
+  render_zip_choropleth(choropleth.df, title, scaleName, states, renderAsInsets)
+}

data/spec/langs/R/ex1_before.R

@@ -0,0 +1,89 @@
+if (base::getRversion() >= "2.15.1") {
+  utils::globalVariables(c("county.fips", "long", "lat", "group", "value", "label", "zipcode", "longitude", "latitude", "value"))
+}
+
+bind_df_to_zip_map = function(df)
+{
+  stopifnot(c("region", "value") %in% colnames(df))
+  df = rename(df, replace=c("region" = "zip"))
+
+  data(zipcode, package="zipcode", envir=environment())
+  choropleth = merge(zipcode, df, all.x=F, all.y=T);
+
+  choropleth = choropleth[choropleth$longitude < -10, ]
+}
+
+print_zip_choropleth = function(choropleth.df, states, scaleName, theme, min, max)
+{
+  stopifnot(states %in% state.abb)
+
+  a = (1 3 4)
+
+  state.df = subset_map("state", states)
+  colnames(state.df)[names(state.df) == "long"] = "longitude"
+  colnames(state.df)[names(state.df) == "lat"]  = "latitude"
+  state.df = arrange(state.df, group, order);
+
+  if (is.numeric(choropleth.df$value))
+  {
+    ggplot(choropleth.df, aes(x=longitude, y=latitude, color=value)) +
+      geom_point() +
+      scale_color_continuous(scaleName, labels=comma) +
+      geom_polygon(data = state.df, color = "black", fill = NA, size = 0.2, aes(group=group)) +
+      theme;
+  } else {
+    stopifnot(length(unique(na.omit(choropleth.df$value))) <= 9)
+    ggplot(choropleth.df, aes(x=longitude, y=latitude, color=value)) +
+      geom_point() +
+      scale_colour_brewer(scaleName, labels=comma) +
+      geom_polygon(data = state.df, color = "black", fill = NA, size = 0.2, aes(group=group)) +
+      theme;
+  }
+}
+
+render_zip_choropleth = function(choropleth.df, title="", scaleName="", states=state.abb, renderAsInsets=TRUE)
+{
+  choropleth.df = choropleth.df[choropleth.df$state %in% states, ]
+
+  min_val = 0
+  max_val = 0
+  if (is.numeric(choropleth.df$value))
+  {
+    min_val = min(choropleth.df$value)
+    max_val = max(choropleth.df$value)
+  }
+
+  if (length(states) == length(state.abb) &&
+        states == state.abb &&
+        renderAsInsets)
+  {
+    alaska.df     = choropleth.df[choropleth.df$state=="AK",]
+    alaska.ggplot = print_zip_choropleth(alaska.df, "AK", "", theme_inset(), min_val, max_val)
+    alaska.grob   = ggplotGrob(alaska.ggplot)
+
+    hawaii.df     = choropleth.df[choropleth.df$state=="HI",]
+    hawaii.ggplot = print_zip_choropleth(hawaii.df, "HI", "", theme_inset(), min_val, max_val)
+    hawaii.grob   = ggplotGrob(hawaii.ggplot)
+
+    choropleth.df = choropleth.df[!choropleth.df$state %in% c("AK", "HI"), ]
+    choropleth = print_zip_choropleth(choropleth.df, setdiff(state.abb, c("AK", "HI")), scaleName, theme_clean(), min_val, max_val) + ggtitle(title)
+
+    choropleth = choropleth +
+      annotation_custom(grobTree(hawaii.grob), xmin=-107.5, xmax=-102.5, ymin=25, ymax=27.5) +
+      annotation_custom(grobTree(alaska.grob), xmin=-125, xmax=-110, ymin=22.5, ymax=30)
+
+  } else {
+    choropleth = print_zip_choropleth(choropleth.df, states, scaleName, theme_clean(), min_val, max_val) + ggtitle(title)
+  }
+
+  choropleth
+}
+
+zip_choropleth_auto = function(df, num_buckets = 9, title = "", scaleName = "", states, renderAsInsets)
+{
+  df = clip_df(df, "zip", states)
+  df = discretize_df(df, num_buckets)
+
+  choropleth.df = bind_df_to_zip_map(df)
+  render_zip_choropleth(choropleth.df, title, scaleName, states, renderAsInsets)
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.27000000
+  version: 0.0.27100000
 platform: ruby
 authors:
 - gogotanaka
@@ -84,6 +84,9 @@ files:
 - README.md
 - Rakefile
 - bin/qlang
+- core/Q.hs
+- core/Q/Lexer.hs
+- core/Q/Parser.hs
 - lib/qlang.rb
 - lib/qlang/api.rb
 - lib/qlang/api/func_api.rb
@@ -110,6 +113,8 @@ files:
 - lib/qlang/version.rb
 - q_lang.gemspec
 - spec/iq_spec.rb
+- spec/langs/R/ex1_after.R
+- spec/langs/R/ex1_before.R
 - spec/lexer/regular_expressions_spec.rb
 - spec/objects/function_spec.rb
 - spec/objects/integral_spec.rb
@@ -144,6 +149,8 @@ specification_version: 4
 summary: Enjoy MATH!
 test_files:
 - spec/iq_spec.rb
+- spec/langs/R/ex1_after.R
+- spec/langs/R/ex1_before.R
 - spec/lexer/regular_expressions_spec.rb
 - spec/objects/function_spec.rb
 - spec/objects/integral_spec.rb