crokus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be5b5ebda83413fed630ed6069d00528c985cc2a29b7d977e5a3ce31b781e267
-  data.tar.gz: 2f450a1c765c7aed5f4707f50b83bdf6d3ec1f9b8e4e5bc2173a41f1c21be556
+  metadata.gz: 6b12095d7e84e7b72f5e38eaa2901dc98044ffd7c42b582a80a72364be03ef29
+  data.tar.gz: 43dbd24919d3ec3e73981d8b9f22345a6f0885b5d1487ace5fbcc00d84070394
 SHA512:
-  metadata.gz: 1b0788d72e8c057b4c2a01581a164e106b33c21c122e2de6a77751e264fdd173f11b5a43044dced72e389eceabf78c4d601912067c486b7a6fc794d94e1c17b7
-  data.tar.gz: 8ff0cc75ee7c2866f611e324439ac278b9c01d57e9df14bfc14cdd8d7c6047ffad0f6a1991caf03f126bce65e098946bb6ece4811e777d02a0fe4416169cdbab
+  metadata.gz: 43c1ab8d6bf5f8a798c8d97ca65de2b04e12ed6f6ce6e76f45ab91813c7484a8c37726c4133056c940cf2366386d8bbd3020afac5ed663dbc14809b7de58f5af
+  data.tar.gz: ada4e46905d24b2cda56582b03f8569baac7bce9b104f548cba1fb594799c901b54c3f7722478dd3a2275b918c0a0f6b962d1f3d74df11d7d562b35ddcee6c46

data/lib/crokus/compiler.rb

@@ -34,7 +34,8 @@ module Crokus
       pretty_print
 
       if options[:trojan]
-        insert_trojan
+        return_code=insert_trojan
+        return return_code
       end
 
       build_tac
@@ -108,9 +109,11 @@ module Crokus
       if infected_ast
         code=PrettyPrinter.new.visit(infected_ast)
         pp_c=@base_name+"_troj.c"
-        puts code
         File.open(pp_c,'w'){|f| f.puts code}
-        puts "   |--> saved as #{pp_c}" unless options[:mute]
+        puts " "*5+"|--> saved as #{pp_c}" unless options[:mute]
+        return true
+      else
+        return false
       end
     end
 

data/lib/crokus/pretty_printer.rb

@@ -159,7 +159,7 @@ module Crokus
       fname=func.name.accept(self)
       args =func.args.collect{|arg| arg.accept(self)}
       args=args.join(",")
-      code = "\n#{tname} #{fname}(#{args})"
+      code = "\n#{tname} #{fname}(#{args});"
       return code
     end
 
@@ -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
 
@@ -434,7 +434,9 @@ module Crokus
       code << "{"
       code.indent=2
       body.each do |stmt|
-        code << stmt.accept(self,true)
+        kode_stmt = stmt.accept(self,true)
+        kode_stmt << ";"
+        code << kode_stmt
       end
       code.indent=0
       code << "}"

data/lib/crokus/trojan_inserter.rb

@@ -28,7 +28,10 @@ module Crokus
       puts " "*1+"|--[+] func #{func.name}"
       func_troj=super(func,args)
       success=insert_trojan(func_troj)
-      @nb_trojans+=1 if success
+      if success
+        @nb_trojans+=1
+        func_troj.name=Ident.new(Token.create "#{func.name}_troj")
+      end
       func_troj
     end
 
@@ -137,7 +140,7 @@ module Crokus
 
     def get_arg_names args
       ret=[]
-      ret << args.map{|formal_arg|
+      args.each{|formal_arg|
         case (type=formal_arg.type)
         when ArrayOf
           if type.size.is_a?(IntLit)
@@ -148,10 +151,11 @@ module Crokus
             end
           end
         else
-          formal_arg.name
+          ret << formal_arg.name
         end
       }
       ret.flatten!
+      ret
     end
 
 

data/lib/crokus/version.rb

@@ -1,3 +1,3 @@
 module Crokus
-  VERSION="0.1.0"
+  VERSION="0.1.1"
 end

metadata

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