vhdl_tb 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60412d4e16c8f944834bc400eea61eb617c2006713e12125a51c38f15ffc39af
-  data.tar.gz: 9a35251fc2315d50c88fb29d0e0ffd7be194db91cce91bc2af1937122f5f0a30
+  metadata.gz: b5c6a6e2dc9eec1e858d36aa4d1c7467ae22c0c8ee24910bc230ffc50ba409f4
+  data.tar.gz: d29098424d3055528c4fe5b1e93158df56df4f886c6ed268a78e58852df3612b
 SHA512:
-  metadata.gz: 9dcaaae2c60bf8c91536c9e8a5c8f6f2c5ec7a57728dcbeb338b11300247f96bdd708c8609bb65b7932bd5c1936cdb026c0c3f04cae9146c327e71640eac158e
-  data.tar.gz: '0229d739111e76d6523876542dde9c0017d154725c6177116d15d5ca86ee77c8a832526d59de64a7550cba467a8c8d90fdf6e7ed985bffd3662ec9dd55fbc8d5'
+  metadata.gz: 59163613e1106f9e386ec27d2dc09f98a5cb0c903ef098c8dacb9ce9de91dc42036782c3af6e787d62f34d745668e2bb57cbebbfc1f3f25dcf9f434bd3cdf6f4
+  data.tar.gz: 2b5be7ebff918648a8f78eaa0b194d6f344fbfcf8fa0a605ddadf76ca819914a092f4e352129789a72bc9191fe1f422e646436e02feffc952313749e699bf037

data/lib/ast.rb

@@ -23,4 +23,11 @@ module VHDL_TB
         "#{self.name}(#{self.lhs} #{self.dir} #{self.rhs})"
       end
     end
+
+
+    Binary=Struct.new(:lhs,:op,:rhs) do
+      def to_s
+        "#{self.lhs} #{self.op} #{self.rhs}"
+      end
+    end
 end

data/lib/compiler.rb

@@ -4,6 +4,7 @@ require 'optparse'
 
 require_relative 'ast'
 require_relative 'parser'
+require_relative 'version'
 
 module VHDL_TB
 
@@ -11,8 +12,6 @@ module VHDL_TB
 
  class Compiler
 
-   VERSION = "0.7.0"
-
    def initialize
      #puts __dir__
      banner

data/lib/lexer.rb

@@ -126,6 +126,7 @@ module VHDL_TB
       token :plus              => /\A\+/
       token :minus             => /\A\-/
       token :times             => /\A\*/
+      token :div               => /\A\//
 
       token :sassign           => /\A\<\=/
       token :imply             => /\A\=\>/

data/lib/parser.rb

@@ -3,8 +3,6 @@ require_relative 'generic_parser'
 require_relative 'ast'
 require_relative 'lexer'
 
-require 'pp'
-
 module VHDL_TB
 
   class Parser < GenericParser
@@ -143,24 +141,35 @@ module VHDL_TB
 
     def parse_type
       type=Identifier.new
-      type.tok=expect(:identifier)
-      if showNext.is_a? :lparen
-        acceptIt
-        name=type.tok
-        type=VectorType.new
-        type.name=name
-        type.lhs=parse_expression
-        if showNext.is_a? [:downto,:to]
-          type.dir=acceptIt
+      case showNext.kind
+      when :identifier
+        type.tok=expect(:identifier)
+        if showNext.is_a? :lparen
+          acceptIt
+          name=type.tok
+          type=VectorType.new
+          type.name=name
+          type.lhs=parse_expression
+          if showNext.is_a? [:downto,:to]
+            type.dir=acceptIt
+          end
+          type.rhs=parse_expression
+          expect :rparen
         end
-        type.rhs=parse_expression
-        expect :rparen
+      else
+        type.tok=acceptIt # natural,...
       end
       type
     end
 
     def parse_expression
-      parse_term
+      e1=parse_term
+      while showNext.is_a? [:plus,:minus,:times,:div]
+        op=acceptIt
+        e2=parse_term
+        e1=Binary.new(e1,op,e2)
+      end
+      return e1
     end
 
     def parse_term

data/lib/version.rb

@@ -0,0 +1,3 @@
+module VHDL_TB
+  VERSION="0.7.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vhdl_tb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies: []
 description: A simple testbench generator for VHDL
 email: jean-christophe.le_lann@ensta-bretagne.fr
@@ -28,6 +28,7 @@ files:
 - lib/parser.rb
 - lib/template.tb.vhd
 - lib/token.rb
+- lib/version.rb
 - tests/circuit.vhd
 homepage: http://rubygems.org/gems/vhdl_tb
 licenses: