tp_plus 0.0.87 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '089886adc4bbf71b0c7e877d2f8273979b72a521'
-  data.tar.gz: b228f3f69f31ccbeaaf352da048a12b5c20a2757
+  metadata.gz: e625891cef7f97673c897135088f39dc574b1cee
+  data.tar.gz: 146cdd66197a98786324ebd045a0299cb12babf9
 SHA512:
-  metadata.gz: 9cde491b92e265e1987577f6d534e467c78260260b4f622ba22b199032b9c932ad8503333cf941c644f7cedf09eda9fa353f5d68a7a90d6636c24208c79901b1
-  data.tar.gz: b03abc4d6ddbbfc6f887f88b2139bc3ab1c2c8f3a89a963f59d6b779bc2ccabacb612c37130c25dd9574375713476dbb6aa14b70a646ae4e680c7c9e8ddcd2de
+  metadata.gz: fd1eb2438aa05e9cd60ee6a53137b9192b9d1f68c7c94e7f1cd3b59f20501fd640c092befcd45a40e8eaa9b5df51b4ee201dd7ac6124e6dc148cb191febc1e95
+  data.tar.gz: f635933eddfe51873f116dd50957daccb7da56d02daefb8def07782ef88f653c4958d2ad3c2d5a8d47700effda3b4a0b1c9f0267b1e3c7db5fd183519b5664b2

data/README.md

@@ -1,87 +1,87 @@
-TP+
-===
-
-[![Build Status](https://travis-ci.org/onerobotics/tp_plus.svg?branch=master)](https://travis-ci.org/onerobotics/tp_plus)
-
-TP+ is a higher-level language abstraction that translates into FANUC
-TP. It features many useful utilities that makes creating TP programs
-easier:
-
-* Identifiers for registers, position registers, IO, etc.
-* Re-usable methods
-* If-else blocks
-* Readable motion statements
-* Automatic label numbering
-
-Of course adding another layer of abstraction takes you a step further
-away from the code the robot is running. However, it's hoped that the
-increased productivity and rigid syntax requirements will actually
-improve your TP code.
-
-Examples
---------
-
-example_1.tpp
-
-    foo  := R[1]
-    bar  := DO[1]
-    baz  := DO[2]
-
-    home := PR[1]
-    lpos := PR[2]
-
-    foo = 1
-
-    @loop
-      foo += 1
-
-      jump_to @loop if foo < 10
-
-    turn_on bar if foo == 5
-    toggle baz
-
-    linear_move.to(home).at(2000mm/s).term(0)
-    get_linear_position(lpos)
-
-
-example_1.ls
-
-    /PROG example_1
-    /MN
-     : 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 ;
-     : PR[2:lpos]=LPOS ;
-    /END
-
-For a more extensive example and test environment, visit http://tp-plus.herokuapp.com/.
-
-Usage
------
-
-1. `gem install tp_plus`
-2. `tpp filename.tpp -o filename.ls`
-
-See `tpp --help` for options.
-
-Development
------------
-
-1. Install Ruby
-2. Install git
-3. Install bundler `gem install bundler`
-4. Clone the repo `git clone https://github.com/onerobotics/tp_plus.git`
-5. Install dependencies with `bundle`
-6. Build the parser and run the tests with `rake`
-
-License
--------
-
-TP+ is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+TP+
+===
+
+[![Build Status](https://travis-ci.org/onerobotics/tp_plus.svg?branch=master)](https://travis-ci.org/onerobotics/tp_plus)
+
+TP+ is a higher-level language abstraction that translates into FANUC
+TP. It features many useful utilities that makes creating TP programs
+easier:
+
+* Identifiers for registers, position registers, IO, etc.
+* Re-usable methods
+* If-else blocks
+* Readable motion statements
+* Automatic label numbering
+
+Of course adding another layer of abstraction takes you a step further
+away from the code the robot is running. However, it's hoped that the
+increased productivity and rigid syntax requirements will actually
+improve your TP code.
+
+Examples
+--------
+
+example_1.tpp
+
+    foo  := R[1]
+    bar  := DO[1]
+    baz  := DO[2]
+
+    home := PR[1]
+    lpos := PR[2]
+
+    foo = 1
+
+    @loop
+      foo += 1
+
+      jump_to @loop if foo < 10
+
+    turn_on bar if foo == 5
+    toggle baz
+
+    linear_move.to(home).at(2000mm/s).term(0)
+    get_linear_position(lpos)
+
+
+example_1.ls
+
+    /PROG example_1
+    /MN
+     : 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 ;
+     : PR[2:lpos]=LPOS ;
+    /END
+
+For a more extensive example and test environment, visit http://tp-plus.herokuapp.com/.
+
+Usage
+-----
+
+1. `gem install tp_plus`
+2. `tpp filename.tpp -o filename.ls`
+
+See `tpp --help` for options.
+
+Development
+-----------
+
+1. Install Ruby
+2. Install git
+3. Install bundler `gem install bundler`
+4. Clone the repo `git clone https://github.com/onerobotics/tp_plus.git`
+5. Install dependencies with `bundle`
+6. Build the parser and run the tests with `rake`
+
+License
+-------
+
+TP+ is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/Rakefile

@@ -1,35 +1,35 @@
-file "lib/tp_plus/parser.rb" => ["generators/parser.y"] do |t|
-  sh "racc -l -t -v -o lib/tp_plus/parser.rb generators/parser.y"
-end
-
-namespace :compile do
-  task :parser do
-    Rake::Task["lib/tp_plus/parser.rb"].invoke
-  end
-end
-
-task compile: ["compile:parser"]
-
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  # build the parser if necessary
-  Rake::Task["lib/tp_plus/parser.rb"].invoke
-
-  t.libs << "test"
-  t.test_files = FileList['test/**/test_*.rb']
-  t.verbose = true
-end
-
-task default: :test
-
-
-desc "Run the TP+ benchmark"
-task :benchmark do
-  ruby "./performance/benchmark.rb"
-end
-
-desc "Run the TP+ profiler"
-task :profile do
-  ruby "./performance/profile.rb"
-end
+file "lib/tp_plus/parser.rb" => ["generators/parser.y"] do |t|
+  sh "racc -l -t -v -o lib/tp_plus/parser.rb generators/parser.y"
+end
+
+namespace :compile do
+  task :parser do
+    Rake::Task["lib/tp_plus/parser.rb"].invoke
+  end
+end
+
+task compile: ["compile:parser"]
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  # build the parser if necessary
+  Rake::Task["lib/tp_plus/parser.rb"].invoke
+
+  t.libs << "test"
+  t.test_files = FileList['test/**/test_*.rb']
+  t.verbose = true
+end
+
+task default: :test
+
+
+desc "Run the TP+ benchmark"
+task :benchmark do
+  ruby "./performance/benchmark.rb"
+end
+
+desc "Run the TP+ profiler"
+task :profile do
+  ruby "./performance/profile.rb"
+end

data/bin/tpp

@@ -1,92 +1,92 @@
-#!/usr/bin/env ruby
-require_relative '../lib/tp_plus'
-require 'optparse'
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: tpp [options] filename"
-
-  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"
-    exit
-  end
-  f = File.open(filename,'rb')
-  src = f.read
-  f.close
-  return src
-end
-
-scanner = TPPlus::Scanner.new
-parser = TPPlus::Parser.new(scanner)
-interpreter = parser.interpreter
-if options[:environment]
-  interpreter.load_environment(contents(options[:environment]))
-end
-
-src = contents(ARGV[0])
-
-scanner.scan_setup(src)
-parser.parse
-
-lines = interpreter.eval
-
-output = %(/PROG #{tpp_filename.upcase}
-/ATTR
-COMMENT = "#{interpreter.header_data[:comment] || tpp_filename.upcase}";
-TCD:  STACK_SIZE	= 0,
-      TASK_PRIORITY	= 50,
-      TIME_SLICE	= 0,
-      BUSY_LAMP_OFF	= 0,
-      ABORT_REQUEST	= 0,
-      PAUSE_REQUEST	= #{interpreter.header_data[:ignore_pause] ? "7" : "0"};
-DEFAULT_GROUP = #{interpreter.header_data[:group_mask] || "1,*,*,*,*"};
-/MN\n)
-
-lines.each_line do |line|
-  output += " : " + line
-end
-
-if interpreter.pos_section != ""
-  output += "/POS\n"
-  output += interpreter.pos_section
-end
-
-output += %(/END\n)
-
-if options[:output]
-  # write to file
-  File.write(options[:output], output)
-else
-  print output
-end
+#!/usr/bin/env ruby
+require_relative '../lib/tp_plus'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: tpp [options] filename"
+
+  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"
+    exit
+  end
+  f = File.open(filename,'rb')
+  src = f.read
+  f.close
+  return src
+end
+
+scanner = TPPlus::Scanner.new
+parser = TPPlus::Parser.new(scanner)
+interpreter = parser.interpreter
+if options[:environment]
+  interpreter.load_environment(contents(options[:environment]))
+end
+
+src = contents(ARGV[0])
+
+scanner.scan_setup(src)
+parser.parse
+
+lines = interpreter.eval
+
+output = %(/PROG #{tpp_filename.upcase}
+/ATTR
+COMMENT = "#{interpreter.header_data[:comment] || tpp_filename.upcase}";
+TCD:  STACK_SIZE	= 0,
+      TASK_PRIORITY	= 50,
+      TIME_SLICE	= 0,
+      BUSY_LAMP_OFF	= 0,
+      ABORT_REQUEST	= 0,
+      PAUSE_REQUEST	= #{interpreter.header_data[:ignore_pause] ? "7" : "0"};
+DEFAULT_GROUP = #{interpreter.header_data[:group_mask] || "1,*,*,*,*"};
+/MN\n)
+
+lines.each_line do |line|
+  output += " : " + line
+end
+
+if interpreter.pos_section != ""
+  output += "/POS\n"
+  output += interpreter.pos_section
+end
+
+output += %(/END\n)
+
+if options[:output]
+  # write to file
+  File.write(options[:output], output)
+else
+  print output
+end