CppUmlClass 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 941afc4bab5da001aad461d35a85b02d00bc8ca19c5c59d300635af5b46b5fba
-  data.tar.gz: bf6b1fc41d09adeec89b83b2284fb5bbee4ca2fb3d0ea770cc409d7f3d59f370
+  metadata.gz: 6b11ad34c06240ad72f271823c30efae82d3aa7b0effd4fd54df08e36503620e
+  data.tar.gz: 6937f38c94cea4348fa207e5cea4808730adc1f6ac6562b43f7e306d47df4345
 SHA512:
-  metadata.gz: ffde1a9637f8e25f835632bfdefa0d1e622ab3cbb403a1fee480d788f2f0d3e41008d5cd677fa5fa55cd89b7c49793c9592359e3c0ec76d762db3ff7b7b67c7d
-  data.tar.gz: 41ca57e7d68425eac35beb2f8be2450048acf02e391c6555f97aa8bc911bbbeba40a01a0771d6fe14148e0a77acd7a9c6a78175363cc1cda8bda73683d1e4a30
+  metadata.gz: e39c4b16f51bbffc4b4a0ae02600fa9376d41529147ec33d7962a4ca31a147936b5d7dd3bd6d509d943f31ff2388b113d096b58f5d20ff746fe07df036117335
+  data.tar.gz: 8cc6b000eb2e3397419c7e6f1ce4243aa77ed50d4a375fe8a3a1c19d36e0e093d0cd750eeaa2c065f2e45730b29a2815170db9fe113cd49b5f09fa889aa60e90

data/lib/CppUmlClass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CppUmlClass
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

data/lib/check_word.rb

@@ -14,6 +14,10 @@ def check_word(buf, check_word)
 end
 
 if $0 == __FILE__
-  buf = File.read(ARGV[0])
-  check_word(buf, ARGV[1])
+  File.read(ARGV[0]).each_line do |line|
+    puts line
+    if check_word(line, ARGV[1])
+      puts "ok"
+    end
+  end
 end

data/lib/create_uml_class.rb

@@ -120,11 +120,11 @@ def print_uml(out, out_list)
       out.push "}"
       # 継承リストの出力
       o_list.inherit_list.each do |ih|
-        out.push "#{o_list.name} -[#blue]-|> #{ih}"
+        out.push "#{o_list.name} -[#blue]--|> #{ih}"
       end
       # compo
       o_list.composition_list.uniq.each do |co|
-        out.push "#{o_list.name} *-[#green]- #{co}"
+        out.push "#{o_list.name} *-[#green]-- #{co}"
       end
     elsif o_list.type == :module_end
       # インスタンス変数がある場合はモジュール名と同じクラスを定義
@@ -145,11 +145,11 @@ def print_uml(out, out_list)
         out.push "}"
         # 継承リストの出力
         o_list.inherit_list.each do |ih|
-          out.push "#{o_list.name} -[#blue]-|> #{ih}"
+          out.push "#{o_list.name} -[#blue]--|> #{ih}"
         end
         # compo
         o_list.composition_list.uniq.each do |co|
-          out.push "#{o_list.name} *-[#green]- #{co}"
+          out.push "#{o_list.name} *-[#green]-- #{co}"
         end
       end
       out.push "}"
@@ -163,12 +163,12 @@ end
 
 def composition_list_create(in_dir, out_list)
   # composition_list
-  Dir.glob("#{in_dir}/**/*.{cpp,hpp}") do |file|
-    if file =~ Regexp.new(@config["exclude_path"])
-      puts "skip #{file}"
+  Dir.glob("#{in_dir}/**/*.{h,cpp,hpp}") do |file|
+    if @config["exclude_path"].to_s != "" and file =~ Regexp.new(@config["exclude_path"])
+      #puts "skip #{file}"
       next
     end
-    puts file
+    #puts file
     # ソースコードの整形
     buf = update_source(file)
     # ソースを解析
@@ -177,16 +177,23 @@ def composition_list_create(in_dir, out_list)
     buf.each_line do |line|
       next if line =~ /^[\r\n]*$/  # 空行は対象外
       next if line =~ /^#/ # #から始まる行は対象外
-      puts line
+      #puts "comp:#{line}"
 
       # ブロックの開始/終了
       if line.match(/\{/)
-        block_count += 1
+        block_count += line.each_char.select { |c| c == "{" }.size
+        start_block = true
+      else
+        start_block = false
       end
+      # ブロックの終了
       if line.match(/\}/)
-        block_count -= 1
+        block_count -= line.each_char.select { |c| c == "}" }.size
+        end_block = true
+      else
+        end_block = false
       end
-      puts "block_count=#{block_count}"
+      #puts "comp:block_count=#{block_count}"
 
       # classの開始
       #if line =~ /^\s*(class)\s/ and File.extname(file) == ".h"
@@ -196,39 +203,30 @@ def composition_list_create(in_dir, out_list)
         class_name = work.split(" : ")[0].to_s.chomp.match(/ [A-Za-z0-9_:]+/).to_s.split(" ")[0]
         #base_name = work.split(" : ")[1].to_s.split(" ")[1].to_s.gsub(/<.*>/, "")
         #puts "start class #{class_name}"
-        cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [])
+        if class_name.to_s != ""
+          cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [])
+        end
       end
-
       # 関数の開始
       #if line =~ /^\S+::\S+/
-      if line.gsub(/<.*>/, "") =~ /^\S.*(\S+)::(\S+).*\(.*{$/ and
+      if line.gsub(/<.*>/, "") =~ /^\S.*(\S+)::(\S+).*\(.*{/ and
          (File.extname(file) == ".cpp" or File.extname(file) == ".hpp")
-        puts "method start"
-        #class_name = line.match(/(\w+)(?=<\w*,?\s*\w*>?::\w+\(\))/).to_s
-        #class_name = line.match(/(\w+)(?=::\S+\(\))/).to_s if class_name == ""
-        #class_name = line.match(/(\w+(?:::\w+)*)(?=::\w+\(.*\))/).to_s if class_name == ""
-        #class_name = class_name.split("::")[1] if class_name =~ /::/
         line.gsub(/<.*>/, "").match(/(\w+)(?=\S+\()/) do |m|
-          puts "class_name=#{m}"
+          #puts "comp:class_name=#{m}"
           cstruct_list.push CStruct.new(:method_start, m.to_s, block_count, [], [], [], [])
           break
         end
-
-        #puts "class_name=[#{class_name}]"
-        #if class_name != ""
-        #  cstruct_list.push CStruct.new(:method_start, class_name, block_count, [], [], [], [])
-        #  next
-        #end
       end
 
       if cstruct_list.size != 0
         class_block_count = cstruct_list[-1].block_count
         if block_count == (class_block_count - 1) # block_countが一致
           # 関数の終了
-          puts "method end #{cstruct_list[-1].name}"
+          #puts "comp:method end #{cstruct_list[-1].name}"
           cstruct_list.slice!(-1) # 最後の要素を削除
         else
-          puts "#{File.basename(file)}:#{block_count}:line3=#{line}"
+          #puts "comp:#{File.basename(file)}:#{block_count}:line3=#{line}"
+          #puts "#{start_block} : #{end_block}"
           my_class_name = cstruct_list[-1].name
           my_cstruct = out_list.select { |m| m.name == my_class_name }[1]
           #pp my_cstruct
@@ -237,13 +235,17 @@ def composition_list_create(in_dir, out_list)
             out_list.each do |clist|
               next if clist.name == my_cstruct.name
               use_class_name = clist.name
-              puts "my_class_name=#{my_class_name} : use_class_name=#{use_class_name}"
+              #puts "my_class_name=#{my_class_name} : use_class_name=#{use_class_name}"
               if check_word(line, use_class_name)
                 #if line.include?(use_class_name)
                 my_cstruct.composition_list.push use_class_name
               end
             end
           end
+          if start_block and end_block # 1行関数
+            cstruct_list.slice!(-1) # 最後の要素を削除
+            #puts "cstruct size=#{cstruct_list.size}"
+          end
         end
       end
     end
@@ -256,7 +258,7 @@ def create_uml_class(in_dir, out_file)
   out = []
   out.push "@startuml"
 
-  puts "in_dir = #{in_dir}"
+  #puts "in_dir = #{in_dir}"
   main_composition_list = []
   main_method_list = []
   global_var = []
@@ -264,11 +266,11 @@ def create_uml_class(in_dir, out_file)
   out_list = []
   #Dir.glob("#{in_dir}/**/*.{cpp,hpp,h}") do |file|
   Dir.glob("#{in_dir}/**/*.{h}") do |file|
-    if file =~ Regexp.new(@config["exclude_path"])
-      puts "skip #{file}"
+    if @config["exclude_path"].to_s != "" and file =~ Regexp.new(@config["exclude_path"])
+      #puts "skip #{file}"
       next
     end
-    puts file
+    #puts file
     # ソースコードの整形
     buf = update_source(file)
 
@@ -280,7 +282,7 @@ def create_uml_class(in_dir, out_file)
     buf.each_line do |line|
       next if line =~ /^[\r\n]*$/  # 空行は対象外
       next if line =~ /^#/ # #から始まる行は対象外
-      puts line
+      #puts line
 
       # ブロックの開始/終了
       if line.match(/\{/)
@@ -292,8 +294,11 @@ def create_uml_class(in_dir, out_file)
       # ブロックの終了
       if line.match(/\}/)
         block_count -= line.each_char.select { |c| c == "}" }.size
+        end_block = true
+      else
+        end_block = false
       end
-      puts "block_count=#{block_count}"
+      #puts "block_count=#{block_count}"
 
       # classの開始
       #if line =~ /^\s*(class)\s/
@@ -305,23 +310,16 @@ def create_uml_class(in_dir, out_file)
         work.split(" : ")[1].to_s.gsub(/(public |private |protected )/, "").to_s.gsub(/<.*>/, "").split(" ").each do |name|
           base_name.push name if name =~ /\w+/
         end
-        puts "start class [#{class_name}]"
-        if class_name == ""
+        #puts "start class [#{class_name}]"
+        if class_name.to_s == ""
           puts file
-          exit
+          next
         end
-        #if out_list.size != 0 and out_list[-1].type == :class_start # classが連続している
-        #  class_name = out_list[-1].name + "." + class_name
-        #  out_list[-1].name = class_name
-        #  cstruct_list[-1].name = class_name
-        #else
         out_list.push CStruct.new(:class_start, class_name, block_count, [], [], [], [])
         cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [])
-        #end
-        #pp line if class_name == ""
         base_name.each do |name|
           name.gsub!(/,/, "")
-          puts "base_name=#{name}"
+          #puts "base_name=#{name}"
           cstruct_list[-1].inherit_list.push name
         end
       end
@@ -342,7 +340,7 @@ def create_uml_class(in_dir, out_file)
           # 関数名を取り出す
           method = line.split(" : ")[0].gsub(/^\s+/, "")
           method = method.split(";")[0].split("{")[0]
-          puts "method=#{method}"
+          #puts "method=#{method}"
           method_list = cstruct_list[-1].method_list
           case method_type
           when :public
@@ -357,7 +355,9 @@ def create_uml_class(in_dir, out_file)
 
       # class変数
       # 括弧を含まない、かつtemplateを含まない文字列
-      if cstruct_list.size != 0 and block_count == cstruct_list[-1].block_count
+      if cstruct_list.size != 0 and
+         (block_count == cstruct_list[-1].block_count or
+          (end_block == true and block_count + 1 == cstruct_list[-1].block_count))
         if line =~ /^[^(){}]*$/ and
            line =~ /^((?!\/tmp\/).)*$/ and
            line =~ /^((?!namespace).)*$/ and
@@ -365,7 +365,7 @@ def create_uml_class(in_dir, out_file)
            line =~ /^((?!public:).)*$/ and
            line =~ /^((?!private:).)*$/ and
            line =~ /^((?!protected:).)*$/
-          puts "class member=#{line}"
+          #puts "class member=#{line}"
           #val = line.split("=")[0].split(" ")[-1]
           val = line.split("=")[0]
           val = val.split(";")[0]
@@ -385,7 +385,7 @@ def create_uml_class(in_dir, out_file)
       if cstruct_list.size != 0
         class_block_count = cstruct_list[-1].block_count
         if block_count == (class_block_count - 1) # block_countが一致
-          puts "class end #{cstruct_list[-1].name}"
+          #puts "class end #{cstruct_list[-1].name}"
           out_list.push cstruct_list[-1]
           cstruct_list.slice!(-1) # 最後の要素を削除
         end
@@ -425,7 +425,7 @@ def create_uml_class(in_dir, out_file)
 end
 
 def search_func(file)
-  puts file
+  #puts file
   # ソースコードの整形
   buf = update_source(file)
   # ソースを解析
@@ -434,9 +434,9 @@ def search_func(file)
     next if line =~ /^#/ # #から始まる行は対象外
     #puts line
     if line.gsub(/<.*>/, "") =~ /^\S.*(\S+)::(\S+).*\(.*{$/
-      puts line.gsub!(/<.*>/, "")
+      #puts line.gsub!(/<.*>/, "")
       line.match(/(\w+)(?=\S+\()/) do |m|
-        puts "class_name=#{m}"
+        #puts "class_name=#{m}"
       end
     end
   end
@@ -447,7 +447,7 @@ if $0 == __FILE__
   #exit
   #buf = update_source(ARGV[0])
   #puts buf
-  @config = { "exclude_path" => "test" }
+  @config = { "exclude_path" => "" }
 
   if true
     puts create_uml_class(ARGV[0], ARGV[1])

data/lib/css/index.css

@@ -2,7 +2,7 @@ body {
     color: #000000;
     background-color: #cac3ec4f;
     overflow: hidden;
-    font-size: 12px;
+    font-size: 14px;
 }
 
 hr {
@@ -49,7 +49,7 @@ textarea.long {
 }
 
 .ui-widget {
-    font-size: 12px;
+    font-size: 14px;
 }
 
 .ui-autocomplete {
@@ -88,25 +88,29 @@ textarea.long {
 }
 
 #setting_dialog {
-    color: #796fe9;
+    color: #ffffff;
     background-color: #000000;
+    font-size: 14px;
 }
 
 .setting_name {
     width: 200px;
-    color: #796fe9;
+    color: #ffffff;
     background-color: #000000;
+    font-size: 14px;
 }
 
 .setting_value {
     width: 300px;
-    color: #796fe9;
+    color: #ffffff;
     background-color: #000000;
+    font-size: 14px;
 }
 
 .setting_checkbox {
-    color: #796fe9;
+    color: #ffffff;
     background-color: #000000;
+    font-size: 14px;
 }
 
 ul.log {
@@ -130,7 +134,7 @@ input[type="search"]::-webkit-search-cancel-button {
     list-style-type: none;
     color: #393737;
     padding: 0;
-    font-size: 12px;
+    font-size: 14px;
     font-weight: bold;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CppUmlClass
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Masataka Kuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_app_base