vhdl_tb 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd1879cca3683122f2deaf4d3e42937f5a4fe870
-  data.tar.gz: 700d2f736b29de611e5b2834ea0e500e8e189a90
+SHA256:
+  metadata.gz: 60412d4e16c8f944834bc400eea61eb617c2006713e12125a51c38f15ffc39af
+  data.tar.gz: 9a35251fc2315d50c88fb29d0e0ffd7be194db91cce91bc2af1937122f5f0a30
 SHA512:
-  metadata.gz: c131814294a059dbe6eb5eaf1a557be6a0326cbcf0fb81014e5c608feb2ed77fbb737cdbc085c331a85c164ab5ce6eeb6015b15f4eb7058e733cdcbf17ba0aea
-  data.tar.gz: 5f300c1af6f426f300d7a87478e44cf4de5d3daacef47df740628508a017c1fe92c2ccddb1d70ae5e04ac975ca97c4d2a90673d77dabe2102e7961d2bfe38ce4
+  metadata.gz: 9dcaaae2c60bf8c91536c9e8a5c8f6f2c5ec7a57728dcbeb338b11300247f96bdd708c8609bb65b7932bd5c1936cdb026c0c3f04cae9146c327e71640eac158e
+  data.tar.gz: '0229d739111e76d6523876542dde9c0017d154725c6177116d15d5ca86ee77c8a832526d59de64a7550cba467a8c8d90fdf6e7ed985bffd3662ec9dd55fbc8d5'

data/lib/compiler.rb

@@ -11,7 +11,7 @@ module VHDL_TB
 
  class Compiler
 
-   VERSION = "0.6.5"
+   VERSION = "0.7.0"
 
    def initialize
      #puts __dir__
@@ -68,6 +68,7 @@ module VHDL_TB
        File.open(tb_filename,'w'){|f| f.puts tb_txt}
        puts "testbench generated : #{tb_filename}"
      rescue Exception => e
+       puts e
        abort
      end
    end
@@ -77,6 +78,7 @@ module VHDL_TB
 
      root=Parser.new.parse entity_filename
 
+     #puts "parsed #{entity_filename}. Good."
      @entity=root.design_units.find{|du| du.class==Entity}
      puts "entity found        : #{@entity.name} (#{@entity.ports.size} ports)"
 

data/lib/generic_lexer.rb

@@ -14,7 +14,7 @@ class GenericLexer
   end
 
   def keyword str
-    @rules.unshift [str.to_sym,/#{str}\b/]
+    @rules.unshift [str.to_sym,/#{str}\b/i]
   end
 
   def token hash
@@ -56,7 +56,7 @@ class GenericLexer
     tokens << next_token() while not @ssc.eos?
     # while not @ssc.eos?
     #   tokens << (p next_token)
-    # end
+    # end #usefull for debug
     tokens
   end
 end

data/lib/lexer.rb

@@ -1,42 +1,145 @@
 require_relative 'generic_lexer'
+require_relative 'generic_parser'
 
-class Lexer < GenericLexer
-  def initialize
-    super
-    ignore /\s+/
+module VHDL_TB
+  class Lexer < GenericLexer
+    def initialize
+      super
+      keyword 'abs'
+      keyword 'access'
+      keyword 'after'
+      keyword 'alias'
+      keyword 'all'
+      keyword 'and'
+      keyword 'architecture'
+      keyword 'array'
+      keyword 'assert'
+      keyword 'attribute'
+      keyword 'begin'
+      keyword 'block'
+      keyword 'body'
+      keyword 'buffer'
+      keyword 'bus'
+      keyword 'case'
+      keyword 'component'
+      keyword 'configuration'
+      keyword 'constant'
+      keyword 'disconnect'
+      keyword 'downto'
+      keyword 'else'
+      keyword 'elsif'
+      keyword 'end'
+      keyword 'entity'
+      keyword 'exit'
+      keyword 'file'
+      keyword 'for'
+      keyword 'function'
+      keyword 'generate'
+      keyword 'generic'
+      keyword 'group'
+      keyword 'guarded'
+      keyword 'if'
+      keyword 'impure'
+      keyword 'inertial'
+      keyword 'inout'
+      keyword 'in'
+      keyword 'is'
+      keyword 'label'
+      keyword 'library'
+      keyword 'linkage'
+      keyword 'literal'
+      keyword 'loop'
+      keyword 'map'
+      keyword 'mod'
+      keyword 'nand'
+      keyword 'natural'
+      keyword 'integer'
+      keyword 'boolean'
+      keyword 'positive'
+      keyword 'new'
+      keyword 'next'
+      keyword 'nor'
+      keyword 'not'
+      keyword 'null'
+      keyword 'of'
+      keyword 'on'
+      keyword 'open'
+      keyword 'or'
+      keyword 'others'
+      keyword 'out'
+      keyword 'package'
+      keyword 'port'
+      keyword 'postponed'
+      keyword 'procedure'
+      keyword 'process'
+      keyword 'pure'
+      keyword 'range'
+      keyword 'record'
+      keyword 'register'
+      keyword 'reject'
+      keyword 'report'
+      keyword 'return'
+      keyword 'rol'
+      keyword 'ror'
+      keyword 'select'
+      keyword 'severity'
+      keyword 'signal'
+      keyword 'shared'
+      keyword 'sla'
+      keyword 'sli'
+      keyword 'sra'
+      keyword 'srl'
+      keyword 'subtype'
+      keyword 'then'
+      keyword 'to'
+      keyword 'transport'
+      keyword 'type'
+      keyword 'unaffected'
+      keyword 'units'
+      keyword 'until'
+      keyword 'use'
+      keyword 'variable'
+      keyword 'wait'
+      keyword 'when'
+      keyword 'while'
+      keyword 'with'
+      keyword 'xnor'
+      keyword 'xorkeyword '
 
-    #comments
-    token :comment   => /--(.*)$/
+      #.............................................................
+      token :comments          => /\A\-\-(.*)$/
+      token :selected_name     => /\w+(\.\w+)+/ # /\S+\w+\.\w+/
+      token :identifier        => /[a-zA-Z]\w*/
 
-    #....keywords
-    keyword :entity
-    keyword :is
-    keyword :generic
-    keyword :port
-    keyword :in
-    keyword :to
-    keyword :downto
-    keyword :out
-    keyword :end
-    keyword :architecture
-    keyword :of
+      token :string_literal    => /"[^"]*"/
+      token :char_literal      => /'(\w+)'/
+      token :attribute_literal => /'(\w+)/
+      token :decimal_literal   => /\d+(\.\d+)?(E([+-]?)\d+)?/
+      token :based_literal     => /\d+#\w+(\.\w+)?#(E[+-]?\d+)/
+      token :bit_string_literal => /(b|o|x)"[^_]\w+"/
+      token :vassign           => /\A\:\=/
+      token :comma             => /\A\,/
+      token :colon             => /\A\:/
+      token :semicolon         => /\A\;/
+      token :lparen            => /\A\(/
+      token :rparen            => /\A\)/
+      token :plus              => /\A\+/
+      token :minus             => /\A\-/
+      token :times             => /\A\*/
 
-    #punctuation
-    token :vassign   => /\:\=/
-    token :sassign   => /\<\=/
-    token :lparen    => /\(/
-    token :rparen    => /\)/
-    token :semicolon => /\;/
-    token :colon     => /\:/
-    token :dot       => /\./
-    token :comma     => /\,/
-    token :rightarrow => /\=\>/
-    token :"-"        => /\-/
-    token :"="        => /\=/
-    #terminals
-    token :id       => /[a-zA-Z_][a-zA-Z0-9_]*/i
-    token :int_lit  => /[0-9]+/
-    token :char_lit  => /'[a-zA-Z0-9_]*'/
-    token :str_lit   => /\"(.*)\"/
-  end
-end
+      token :sassign           => /\A\<\=/
+      token :imply             => /\A\=\>/
+      token :eq                => /\A\=/
+      token :ampersand         => /\A\&/
+      token :neq               => /\A\/\=/
+      token :gte               => /\A\>\=/
+      token :gt                => /\A\>/
+      token :lt                => /\A\</
+      token :urange            => /\A<>/
+      #............................................................
+      token :newline           =>  /[\n]/
+      token :space             => /[ \t\r]+/
+
+    end #def
+  end #class
+end #module

data/lib/parser.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require_relative 'generic_parser'
 require_relative 'ast'
 require_relative 'lexer'
@@ -11,20 +12,27 @@ module VHDL_TB
     attr_accessor :basename,:filename
 
     def initialize
+      #@verbose=true
       @lexer=Lexer.new
     end
 
-    def parse filename
-      str=IO.read(filename)
+    def lex filename
+      unless File.exists?(filename)
+        raise "ERROR : cannot find file '#{filename}'"
+      end
       begin
-        @tokens=lexer.tokenize(str)
-        @tokens=tokens.select{|t| t.class==Token} # filters [nil,nil,nil]
-        @tokens=tokens.reject{|tok| tok.is_a? [:comment,:newline]}
+        str=IO.read(filename)
+        tokens=lexer.tokenize(str)
+        tokens=tokens.select{|t| t.class==Token} # filters [nil,nil,nil]
+        return tokens.reject{|tok| tok.is_a? [:comment,:newline,:space]}
       rescue Exception=>e
-        puts e
         puts "an error occured during LEXICAL analysis. Sorry. Aborting."
         raise
       end
+    end
+
+    def parse filename
+      @tokens=lex(filename)
       root=Root.new([])
       begin
         consume_to :entity
@@ -34,7 +42,7 @@ module VHDL_TB
         root.design_units << archi=parse_architecture
 
       rescue Exception => e
-        #puts e.backtrace
+        puts e.backtrace
         puts e
         puts "an error occured during SYNTACTIC analysis (around line #{showNext.pos.first}). Sorry. Aborting."
         raise
@@ -54,7 +62,7 @@ module VHDL_TB
     def parse_entity
       entity=Entity.new(nil,nil,[])
       expect :entity
-      entity.name=expect :id
+      entity.name=expect :identifier
       expect :is
       if showNext.is_a? :generic
         entity.generics=parse_generics
@@ -63,6 +71,9 @@ module VHDL_TB
         entity.ports=parse_ports
       end
       expect :end
+      if showNext.is_a? :semicolon
+        acceptIt
+      end
       return entity
     end
 
@@ -84,10 +95,10 @@ module VHDL_TB
 
     def parse_generic
       ids=[]
-      ids << expect(:id)
+      ids << expect(:identifier)
       while showNext.is_a? :comma
         acceptIt
-        ids << expect(:id)
+        ids << expect(:identifier)
       end
       expect :colon
       type=parse_type
@@ -116,10 +127,10 @@ module VHDL_TB
 
     def parse_io
       ids=[]
-      ids << expect(:id)
+      ids << expect(:identifier)
       while showNext.is_a? :comma
         acceptIt
-        ids << expect(:id)
+        ids << expect(:identifier)
       end
       expect :colon
       if showNext.is_a? [:in,:out]
@@ -132,7 +143,7 @@ module VHDL_TB
 
     def parse_type
       type=Identifier.new
-      type.tok=expect(:id)
+      type.tok=expect(:identifier)
       if showNext.is_a? :lparen
         acceptIt
         name=type.tok
@@ -153,11 +164,11 @@ module VHDL_TB
     end
 
     def parse_term
-      if showNext.is_a? [:int_lit,:id]
+      if showNext.is_a? [:decimal_literal,:identifier]
         case showNext.kind
-        when :int_lit
+        when :decimal_literal
           return IntLit.new(acceptIt)
-        when :id
+        when :identifier
           return Identifier.new(acceptIt)
         else
           puts "cannot parse term"
@@ -168,9 +179,9 @@ module VHDL_TB
     def parse_architecture
       archi=Architecture.new
       expect :architecture
-      archi.name=expect(:id)
+      archi.name=expect(:identifier)
       expect :of
-      archi.entity=expect(:id)
+      archi.entity=expect(:identifier)
       archi
     end
   end

data/lib/token.rb

@@ -40,6 +40,10 @@ class Token
     Token.new [:id,str,[0,0]]
   end
 
+  # def inspect
+  #   "(#{@kind.to_s.ljust(15,' ')},'#{@val}',#{@pos})"
+  # end
+
   def to_s
     val
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vhdl_tb
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies: []
 description: A simple testbench generator for VHDL
 email: jean-christophe.le_lann@ensta-bretagne.fr
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: VHDL Testbench generator