crokus 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb68605a201bca25f5f843ace95ff078e9a0d2ede923847a7a21f8fcc99377d
-  data.tar.gz: 0754e6251c17663e2206c01e494c0dbb148bdb9329ffc7df1fa06e89a399c8d4
+  metadata.gz: cc241276f39be6875db2caf5b00a5a4922906163c97bbe183d0e05dd697162c1
+  data.tar.gz: 1491b17c9072e7c1c52a7dc136b3a604444a36ff39548754eb3ca87654e20b6a
 SHA512:
-  metadata.gz: d62a9ad0c30d023374bfb14319e3cab47124e7983f7a62eb24d939625ea8fbf0d40795c4ffe8bf9aa08fa4715cef20560f3ed274304d1c0d7ea168e00302bede
-  data.tar.gz: 550b3d0f5c214c3c13c218a1759becfe5812b24e2426ab54cc4dae6a14a37f168876a7ecfbbb09a010b9ebfc98a8e8fb28ac44dccbe1757e4e448d522c9132bb
+  metadata.gz: 6d2f4763cf304256a1a08ab6974535e5c6448e354eeef787389e1c27424c276268a6cf3b702428c68dafbc8b60f260d143f39b52634152ccd0302537989bf073
+  data.tar.gz: 9b9d32f8346b783b960c8a4ff077b2d01e001833adbfb72e9c7e3d8961428a894be8e55adba1a39eb6b6932b7b55db41c8822cf743cad742f9278d249a250a26

data/lib/crokus/cfg.rb

@@ -35,7 +35,7 @@ module Crokus
       @bbs << bb
     end
 
-    def print
+    def print versbose=false
       CFGPrinter.new.print(self,5)
     end
 

data/lib/crokus/cfg_printer_c.rb

@@ -2,15 +2,17 @@ module Crokus
 
   class PrinterC
 
-    attr_accessor :cfg
+    attr_accessor :cfg, :options
 
-    def initialize
+    def initialize options={}
+      @options=options
       @visited=[]
       @prp=PrettyPrinter.new
     end
 
     def print cfg
-      puts " |-->[+] generating C code from cfg '#{cfg.name}'"
+      filename= "#{cfg.name}.c"
+      puts " |-->[+] generating C code from cfg '#{cfg.name}' in '#{filename}'"
       @cfg=cfg
       code=Code.new
       code << "//"+"-"*60
@@ -34,8 +36,8 @@ module Crokus
       code << "}"
       code.newline
       code << main(cfg)
-      puts code.finalize
-      code.save_as "#{cfg.name}.c"
+      puts code.finalize if options[:verbose]
+      code.save_as filename
     end
 
     def main cfg

data/lib/crokus/cfg_random_gen.rb

@@ -13,10 +13,15 @@ end
 module Crokus
 
   class RandomGen
+    attr_accessor :options
     attr_accessor :cfg
 
+    def initialize options={}
+      @options=options
+    end
+
     def run params
-      puts "[+] running random Newage code generation"
+      puts "[+] running random C code generation"
       puts " |-->[+] reading parameters file '#{params}'"
       @params=YAML.load(File.read(params))
       init_cfg
@@ -30,7 +35,7 @@ module Crokus
       gen_dot # to see the structure, before hacking the content
       populate_all
       generate_c
-      #print_infos
+      print_infos
     end
 
 
@@ -306,7 +311,7 @@ module Crokus
     end
 
     def generate_c
-      PrinterC.new.print(cfg)
+      PrinterC.new(options).print(cfg)
     end
   end
 end

data/lib/crokus/compiler.rb

@@ -28,6 +28,8 @@ module Crokus
       parse(filename)
       return true if options[:parse_only]
 
+      draw_ast(@ast) if options[:ast]
+
       build_cfg
       return true if options[:cfg]
 
@@ -55,7 +57,7 @@ module Crokus
     end
 
     def draw_ast tree=nil,filename=nil
-      dotname=filename || "#{base_name}.dot"
+      dotname=filename || "#{base_name}_ast.dot"
       puts "   |--[+] drawing AST '#{dotname}'" unless options[:mute]
       ast_ = tree || @ast
       dot=AstPrinter.new.print(ast_)

data/lib/crokus/pretty_printer.rb

@@ -194,7 +194,7 @@ module Crokus
       if assign.rhs.is_a? Parenth
         rhs=assign.rhs.expr.accept(self)
       end
-      ret="#{lhs} #{op} #{rhs}"
+      ret="#{lhs} #{op} #{rhs};"
       ret
     end
 

data/lib/crokus/runner.rb

@@ -69,10 +69,6 @@ module Crokus
         options[:random] = params_filename
       end
 
-      # parser.on('--trojan PARAMS', "generates random c files, using parameters", String) do |params_filename|
-      #   options[:trojan] = params_filename
-      # end
-
       parser.on('--trojan', "generates random c files, using parameters") do
         options[:trojan] = true
       end

data/lib/crokus/version.rb

@@ -1,3 +1,3 @@
 module Crokus
-  VERSION="0.1.2"
+  VERSION="0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution