oryx 0.1.1 → 0.2.1

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in oryx.gemspec
 gemspec
+
+gem 'rltk', git: 'git://github.com/chriswailes/RLTK.git'
+

data/README.md

@@ -12,17 +12,11 @@ C-Flat is a working subset of C designed for use in compilers courses. C-flat in
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'oryx'
-
-And then execute:
-
-    $ bundle
+    $ gem install oryx
 
-Or install it yourself as:
+## Requirements
 
-    $ gem install oryx
+- Ruby >= 1.9.3
 
 ## Usage
 
@@ -35,6 +29,7 @@ For more details try
 ## See Also
 `bin/oryx.markdown`
 
+
 ## Contributing
 As this is a course project pull requests will be ignored.
 

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
-require 'binman/rakefile'
 
 Rake::TestTask.new do |t|
   t.libs << 'lib/oryx'

data/lib/oryx/ast.rb

@@ -0,0 +1,74 @@
+require 'rltk/ast'
+
+module Oryx
+  class Expression < RLTK::ASTNode; end
+
+  class Number < Expression
+    value :value, Integer
+  end
+
+  class Variable < Expression
+    value :name, String
+  end
+
+  class Binary < Expression
+    child :left, Expression
+    child :right, Expression
+  end
+
+  class Assign < Expression
+    value :name, String
+    child :right, Expression
+  end
+
+  class Add < Binary; end
+  class Sub < Binary; end
+  class Mul < Binary; end
+  class Div < Binary; end
+
+  class GE  < Binary; end
+  class GEQ < Binary; end
+  class LE  < Binary; end
+  class LEQ < Binary; end
+  class EQ < Binary; end
+  class NEQ < Binary; end
+
+  class Return < Expression
+    child :right, Expression
+  end
+
+  class If < Expression
+    child :cond, Expression
+    child :then, Expression
+    child :else, Expression
+  end
+
+  class CodeBlock < Expression
+    child :statements, [Expression]
+  end
+
+  class ParamList < RLTK::ASTNode
+    child :params, [Expression]
+  end
+
+  class Function < RLTK::ASTNode
+    value :i, String
+    child :params, ParamList
+    child :body, CodeBlock
+  end
+
+  class While < Expression
+    child :condition, Expression
+    child :body, CodeBlock
+  end
+
+  class Type < Expression
+    value :t, String
+  end
+
+  class Boolean < Type; end
+  class Char < Type; end
+  class Int < Type; end
+  class Str < Type; end
+
+end

data/lib/oryx/parser.rb

@@ -0,0 +1,116 @@
+require 'rltk'
+require_relative "../oryx"
+
+module Oryx
+  class Parser < RLTK::Parser
+
+    left :ASSIGN, :RETURN
+    left :EQ, :NEQ
+    left :GE, :GEQ, :LE, :LEQ
+    left :PLUS, :MINUS
+    left :TIMES, :DIV
+
+    production(:input) do
+      clause('') { || [] }
+      clause('ext_dec_list') { |edl| edl }
+    end
+
+    production(:external_declaration) do
+      clause('vdecl') { |v| v }
+      clause('vinit') { |v| v }
+      clause('fdecl') { |f| f }
+    end
+
+    production(:ext_dec_list) do
+      clause('ext_dec_list external_declaration') { |edl, ed| edl + Array(ed)}
+      clause('external_declaration') { |ed| [ed] }
+    end
+
+    production(:vdecl) do
+      clause('type_spec IDENT SEMI') { |t, i, _| Variable.new i}
+    end
+
+    production(:vinit) do
+      clause('type_spec IDENT ASSIGN constant SEMI') { |t, i, _, c, _| Assign.new i, c}
+    end
+
+    production(:fdecl) do
+      clause('type_spec IDENT LPAREN opt_param_list RPAREN code_block') { |t, i, _, opl,  _, c| Function.new i, opl, c }
+    end
+
+    production(:opt_param_list) do
+      clause('') { || ParamList.new [] }
+      clause('param_list') { |pl| ParamList.new pl}
+    end
+
+    production(:param_list) do
+      clause('param') { |p| [p] }
+      clause('param COMMA param_list') { |p, _, pl| Array(p) + pl }
+    end
+
+    production(:param) do
+      clause('type_spec IDENT') { |t, i| Variable.new i }
+    end
+
+    production(:constant) do
+      clause('NUM')     { |n| Number.new n.to_i }
+      clause('STRCON')  { |s| Cstring.new s}
+      clause('CHARCON') { |c| Char.new c }
+    end
+
+    production(:type_spec) do
+      clause('BOOLEAN') { |_| Boolean.new 'bool'}
+      clause('CHAR')    { |_| Char.new 'char'}
+      clause('INT')     { |_| Int.new 'int'}
+      clause('STRING')  { |_| Str.new 'str'}
+      clause('VOID')    { |_| }
+    end
+
+    production(:code_block) do
+      clause('LCURLY statement_list RCURLY') { |_, sl, _| CodeBlock.new(sl) }
+    end
+
+    production(:statement_list) do
+      clause('') { || [] }
+      clause('statement_list statement') { |sl, s| sl + Array(s) }
+      clause('statement') { |s| [s] }
+    end
+
+    production(:statement) do
+      clause('e SEMI') { |e, _| e }
+      clause('if_statement') { |i| i}
+      clause('WHILE LPAREN e RPAREN code_block') {|_,_,e,_,c| While.new(e,c) }
+    end
+
+    production(:if_statement) do
+      clause('IF LPAREN e RPAREN statement') { |_, _, e, _, s| If.new(e, s, nil) }
+      clause('IF LPAREN e RPAREN statement ELSE statement') { |_,_,e,_,ts,_,fs| If.new(e, ts, fs) }
+      clause('IF LPAREN e RPAREN code_block ELSE code_block') {|_,_,e,_,tc,_,fc| If.new(e, tc, fc) }
+    end
+
+    production(:e) do
+      clause('LPAREN e RPAREN') { |_, e, _| e }
+
+      clause('IDENT') { |i| Variable.new i }
+      clause('constant') { |c| c }
+      clause('IDENT ASSIGN e') { |e0, _, e1| Assign.new e0, e1 }
+
+      clause('e PLUS e')  { |e0, _, e1| Add.new(e0, e1) }
+      clause('e MINUS e') { |e0, _, e1| Sub.new(e0, e1) }
+      clause('e TIMES e') { |e0, _, e1| Mul.new(e0, e1) }
+      clause('e DIV e')   { |e0, _, e1| Div.new(e0, e1) }
+      clause('e GE e')    { |e0, _, e1| GE.new(e0, e1) }
+      clause('e GEQ e')   { |e0, _, e1| GEQ.new(e0, e1) }
+      clause('e LE e')    { |e0, _, e1| LE.new(e0, e1) }
+      clause('e LEQ e')   { |e0, _, e1| LEQ.new(e0, e1) }
+      clause('e EQ e')    { |e0, _, e1| EQ.new(e0, e1) }
+      clause('e NEQ e')   { |e0, _, e1| NEQ.new(e0, e1) }
+
+
+      clause('RETURN e')  { |_, e| Return.new e }
+
+    end
+
+    finalize explain: 'explain.out'
+  end
+end

data/lib/oryx/runner.rb

@@ -18,6 +18,9 @@ module Oryx
       l = Lexer.new
       output_filename.open('w:UTF-8') { |f| f.write(tabularize_output l.lex_file(input_filename.to_s)) }
       puts "complete".green
+
+      p = Parser.new
+      p.parse(l.lex_file(input_filename.to_s), parse_tree: 'tree.dot', verbose: 'parse.out')
     end
 
     private

data/lib/oryx/version.rb

@@ -1,3 +1,3 @@
 module Oryx
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/oryx.rb

@@ -1,8 +1,9 @@
 require "oryx/version"
-require "oryx/preprocessor"
 require "oryx/options"
 require "oryx/runner"
 require "oryx/lexer"
+require "oryx/parser"
+require "oryx/ast"
 
 module Oryx
   # Your code goes here...

data/oryx.gemspec

@@ -6,7 +6,6 @@ require 'oryx/version'
 Gem::Specification.new do |gem|
   gem.name          = "oryx"
   gem.version       = Oryx::VERSION
-  gem.date          = Date.today.to_s
   gem.authors       = ["Casey Robinson"]
   gem.email         = ["kc@rampantmonkey.com"]
   gem.description   = %q{C-Flat to x86 compiler}
@@ -14,15 +13,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/rampantmonkey/oryx"
 
   gem.files         = `git ls-files`.split($/)
-  gem.files        += Dir['man/man?/*.?']
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) unless !f and f["markdown"]}
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'rake', '~>0.9.2.2'
   gem.add_development_dependency 'shoulda', '~>3.3.2'
-  gem.add_development_dependency 'md2man', '~>1.4'
-  gem.add_development_dependency 'binman', '~>3.2.0'
 
   gem.add_dependency 'rltk', '~>2.2.1'
   gem.add_dependency 'colorize', '~>0.5.8'

data/test/lib/oryx/parser_test.rb

@@ -0,0 +1,8 @@
+require_relative '../../test_helper'
+require 'rltk'
+
+module Oryx
+  class TestParser < Test::Unit::TestCase
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oryx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,38 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.2
-- !ruby/object:Gem::Dependency
-  name: md2man
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: binman
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rltk
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +80,6 @@ email:
 - kc@rampantmonkey.com
 executables:
 - oryx
-- oryx.markdown
 extensions: []
 extra_rdoc_files: []
 files:
@@ -123,19 +90,18 @@ files:
 - README.md
 - Rakefile
 - bin/oryx
-- bin/oryx.markdown
 - lib/oryx.rb
+- lib/oryx/ast.rb
 - lib/oryx/lexer.rb
 - lib/oryx/options.rb
-- lib/oryx/preprocessor.rb
+- lib/oryx/parser.rb
 - lib/oryx/runner.rb
 - lib/oryx/version.rb
 - oryx.gemspec
 - test/lib/oryx/lexer_test.rb
-- test/lib/oryx/preprocessor_test.rb
+- test/lib/oryx/parser_test.rb
 - test/lib/oryx/version_test.rb
 - test/test_helper.rb
-- man/man1/oryx.1
 homepage: http://github.com/rampantmonkey/oryx
 licenses: []
 post_install_message: 
@@ -150,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2601944800396312341
+      hash: 730399691837607602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2601944800396312341
+      hash: 730399691837607602
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -168,6 +134,6 @@ specification_version: 3
 summary: Take a program written in C-Flat and convert it to x86 assembly
 test_files:
 - test/lib/oryx/lexer_test.rb
-- test/lib/oryx/preprocessor_test.rb
+- test/lib/oryx/parser_test.rb
 - test/lib/oryx/version_test.rb
 - test/test_helper.rb

data/bin/oryx.markdown

@@ -1,29 +0,0 @@
-=begin===
-# ORYX 2013-2-20 0.1.0
-
-## NAME
-
-oryx - cflat tokenizer
-
-## SYNOPSIS
-
-`oryx` [-o output-file] input-file
-
-## DESCRIPTION
-
-[oryx] produces a table of tokens representing the source code contained in `input-file`. If invalid characters/strings are found they are returned as error tokens and lexing continues. Oryx can even handle (in other words not throw an exception) when given random input, as shown by the test suite.
-
-## OPTIONS
-
-`-h`, `--help`
-    Show list of options and usage
-
-`-o`, `--output` [*FILE*]
-    Specify the filename in which to write the token table
-
-
-## SEE ALSO
-
-clang(1), gcc(1)
-
-=end===

data/lib/oryx/preprocessor.rb

@@ -1,21 +0,0 @@
-module Oryx
-  class Preprocessor
-    def initialize
-    end
-
-    def parse content
-      content = remove_comment content
-      remove_outer_whitespace content
-    end
-
-    def remove_comment content
-      content.gsub /\/\*.*?\*\//, ''
-    end
-
-    def remove_outer_whitespace content
-      content.lstrip.rstrip
-    end
-
-
-  end
-end

data/man/man1/oryx.1

@@ -1,21 +0,0 @@
-.TH ORYX 2013\-2\-20 0.1.0
-.SH NAME
-.PP
-oryx \- cflat tokenizer
-.SH SYNOPSIS
-.PP
-\fB\fCoryx\fR [\-o output\-file] input\-file
-.SH DESCRIPTION
-.PP
-[oryx] produces a table of tokens representing the source code contained in \fB\fCinput-file\fR. If invalid characters/strings are found they are returned as error tokens and lexing continues. Oryx can even handle (in other words not throw an exception) when given random input, as shown by the test suite.
-.SH OPTIONS
-.PP
-\fB\fC-h\fR, \fB\fC--help\fR
-    Show list of options and usage
-.PP
-\fB\fC-o\fR, \fB\fC--output\fR [\fIFILE\fP]
-    Specify the filename in which to write the token table
-.SH SEE ALSO
-.PP
-.BR clang (1), 
-.BR gcc (1)

data/test/lib/oryx/preprocessor_test.rb

@@ -1,65 +0,0 @@
-require_relative '../../test_helper'
-
-module Oryx
-  class TestPreprocessor < Test::Unit::TestCase
-    context "one line inputs" do
-      setup do
-        @preprocessor = Preprocessor.new
-      end
-
-      should "not modify empty input" do
-        test_input = ""
-        assert_equal test_input, @preprocessor.parse(test_input)
-      end
-
-      should "not modify simple assignment" do
-        test_input = "int length=7;"
-        assert_equal test_input, @preprocessor.parse(test_input)
-      end
-
-      should "remove block comment" do
-        test_input = "/* this is a block comment in c */"
-        assert_equal "", @preprocessor.parse(test_input)
-      end
-
-      should "remove trailing comment" do
-        test_input = "int a = 5; /* a */"
-        assert_equal "int a = 5;", @preprocessor.parse(test_input)
-      end
-
-      should "remove starting comment" do
-        test_input = "/* a */ int a = 5;"
-        assert_equal "int a = 5;", @preprocessor.parse(test_input)
-      end
-
-      should "remove both comments" do
-        test_input = "/* a */ int a = 5; /* b */"
-        assert_equal "int a = 5;", @preprocessor.parse(test_input)
-      end
-
-      should "remove tons of comments" do
-        test_input = "/* a */"*700 + " int a = 5; " + "/* b */"*107
-        assert_equal "int a = 5;", @preprocessor.parse(test_input)
-      end
-    end
-
-    context "multi line test" do
-      setup do
-        @preprocessor = Preprocessor.new
-      end
-
-      should "remove extra newline" do
-        test_input = "\n"
-        assert_equal "", @preprocessor.parse(test_input)
-      end
-
-      should "do nothing" do
-        test_input = "int a=5;\na++"
-        assert_equal test_input, @preprocessor.parse(test_input)
-      end
-    end
-
-
-  end
-end
-