vhdl_tb 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60412d4e16c8f944834bc400eea61eb617c2006713e12125a51c38f15ffc39af
-  data.tar.gz: 9a35251fc2315d50c88fb29d0e0ffd7be194db91cce91bc2af1937122f5f0a30
+  metadata.gz: d7f7b2e505776bf00148cc42e65b506ba3b5368c01f77004d487f9fb70cb0b6a
+  data.tar.gz: 2af2e0abfed315c9830de2d50a53b73de239e1e39ba5f56965cd41a4e01b50a8
 SHA512:
-  metadata.gz: 9dcaaae2c60bf8c91536c9e8a5c8f6f2c5ec7a57728dcbeb338b11300247f96bdd708c8609bb65b7932bd5c1936cdb026c0c3f04cae9146c327e71640eac158e
-  data.tar.gz: '0229d739111e76d6523876542dde9c0017d154725c6177116d15d5ca86ee77c8a832526d59de64a7550cba467a8c8d90fdf6e7ed985bffd3662ec9dd55fbc8d5'
+  metadata.gz: d34267cb16bf1413777547f7314a4669fe98841ee7f965ae09f2635fbc8648324ae348a9cbf2b9b66026da5003b09da2c47b650a5b6529046a2815e9b6909af4
+  data.tar.gz: 1a1b7a75777ddfeb3d68a7e48db728a7afe213abb4cc92258009e1cda62b9b4ec51c0f0219ce673b9eae66ab4fc97f7799237dbe2bf58b45f4a34a096573a9f3

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

@@ -107,7 +107,7 @@ module VHDL_TB
       keyword 'xorkeyword '
 
       #.............................................................
-      token :comments          => /\A\-\-(.*)$/
+      token :comment          => /\A\-\-(.*)$/
       token :selected_name     => /\w+(\.\w+)+/ # /\S+\w+\.\w+/
       token :identifier        => /[a-zA-Z]\w*/
 
@@ -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\=\>/
@@ -136,6 +137,7 @@ module VHDL_TB
       token :gt                => /\A\>/
       token :lt                => /\A\</
       token :urange            => /\A<>/
+      token :dot               => /\A\./
       #............................................................
       token :newline           =>  /[\n]/
       token :space             => /[ \t\r]+/

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.5"
+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.5
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-11-08 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:
@@ -48,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: VHDL Testbench generator