tp_plus 0.0.75 → 0.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 715a2b6920c4a27cba58ad07cdef950bce8dc85b
-  data.tar.gz: 1d67bbde251dd3dc0c84f346b49cce19c07bcf45
+  metadata.gz: 7347bb879e0d8008d909ad4888596f07697bd0f4
+  data.tar.gz: bb148385881540ada26d78565576dc8ce8df7acc
 SHA512:
-  metadata.gz: 83cbd62b3807e17cc20bfb6d4f426197f6d8da570628bb9e89d6e5f95b135b190b2e08283c483d3afa9f26a6d21e2e762360fd0ec6b45f93f68dc1346f6b8713
-  data.tar.gz: 5514468372d3b436202ac3f4a80f86fe0f0c5365408e124db71c13d03139a3b4bc70abc120b89c37cbb595f482a96d88a9399e4fb8431d86a0eedefe0b004973
+  metadata.gz: 786218479e3e4bdee08f867f8d97d04dc73052bdbec3c686088d1dc2d384a3a302d57a479e55facf754b745073f5b75bcd0b09397cc327aa23631d449cb46067
+  data.tar.gz: ad566ce1eab3649796fb06b1e2963a7749c7ee28548e476086941f40b540883c7117e876418648d8b5beec83b129b5a59ef74a4c9f70790f2275687060edfc5a

data/README.md

@@ -46,16 +46,16 @@ example_1.ls
 
     /PROG example_1
     /MN
-      1:  R[1:foo] = 1 ;
-      1:   ;
-      1:  LBL[100:loop] ;
-      1:  R[1:foo]=R[1:foo]+1 ;
-      1:  IF R[1:foo]<10,JMP LBL[100] ;
-      1:   ;
-      1:  IF (R[1:foo]=5),DO[1:bar]=(ON) ;
-      1:  DO[2:baz]=(!DO[2:baz]) ;
-      1:   ;
-      1:  L PR[1:home] 2000mm/sec CNT0 ;
+     : R[1:foo] = 1 ;
+     :  ;
+     : LBL[100:loop] ;
+     : R[1:foo]=R[1:foo]+1 ;
+     : IF R[1:foo]<10,JMP LBL[100] ;
+     :  ;
+     : IF (R[1:foo]=5),DO[1:bar]=(ON) ;
+     : DO[2:baz]=(!DO[2:baz]) ;
+     :  ;
+     : L PR[1:home] 2000mm/sec CNT0 ;
     /END
 
 For a more extensive example and test environment, visit http://tp-plus.herokuapp.com/.
@@ -64,7 +64,7 @@ Usage
 -----
 
 1. `gem install tp_plus`
-2. `tpp filename.tpp > filename.ls`
+2. `tpp filename.tpp -o filename.ls`
 
 See `tpp --help` for options.
 

data/bin/tpp

@@ -1,24 +1,44 @@
 #!/usr/bin/env ruby
-require 'tp_plus'
+require_relative '../lib/tp_plus'
 require 'optparse'
 
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: tpp [options] filename"
 
-  opts.on("-e", "--environment env_file.tpp", "Require an environment file before parsing files") do |e|
+  opts.on("-e", "--environment <file>", "Require an environment file <file> before parsing") do |e|
     options[:environment] = e
   end
 
+  opts.on("-o", "--output <file>", "Write output to <file>") do |o|
+    options[:output] = o
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
   end
 end.parse!
 
+if ARGV.length != 1
+  puts "Must provide filename argument. See tpp --help for details"
+  exit
+end
+
+tpp_filename = File.basename(ARGV[0],".*")
+
+if options[:output]
+  # ensure filename matches (FANUC parser will complain otherwise)
+  output_filename = File.basename(options[:output], ".*")
+  if output_filename != tpp_filename
+    puts "Output filename <#{output_filename}> does not match input filename <#{tpp_filename}>"
+    exit
+  end
+end
+
 def contents(filename)
   if !File.exist?(filename)
-    puts "File (#{filename}) does not exist"
+    puts "File <#{filename}> does not exist"
     exit
   end
   f = File.open(filename,'rb')
@@ -34,11 +54,6 @@ if options[:environment]
   interpreter.load_environment(contents(options[:environment]))
 end
 
-if ARGV.length != 1
-  puts "Must provide filename argument. See tpp --help for details"
-  exit
-end
-
 src = contents(ARGV[0])
 
 scanner.scan_setup(src)
@@ -46,7 +61,6 @@ parser.parse
 
 lines = interpreter.eval
 
-tpp_filename = File.basename(ARGV[0],".*")
 output = %(/PROG #{tpp_filename.upcase}
 /ATTR
 COMMENT = "#{interpreter.header_data[:comment] || tpp_filename.upcase}";
@@ -70,4 +84,9 @@ end
 
 output += %(/END\n)
 
-print output
+if options[:output]
+  # write to file
+  File.write(options[:output], output)
+else
+  print output
+end

data/lib/tp_plus/interpreter.rb

@@ -1,4 +1,4 @@
-require 'tp_plus/parser'
+require_relative 'parser'
 
 module TPPlus
   class Interpreter

data/lib/tp_plus/nodes/position_data_node.rb

@@ -18,6 +18,8 @@ module TPPlus
         return false if @ids.include?(position_hash[:id])
         @ids.push(position_hash[:id])
 
+        return false unless position_hash[:mask].is_a? Array
+
         position_hash[:mask].select {|q|
           !mask_valid?(q)
         }.empty?

data/lib/tp_plus/version.rb

@@ -1,3 +1,3 @@
 module TPPlus
-  VERSION = '0.0.75'
+  VERSION = '0.0.76'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tp_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.75
+  version: 0.0.76
 platform: ruby
 authors:
 - Jay Strybis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips