bug fix

python/tools/garble/java_garble.py

@@ -145,7 +145,7 @@ class JavaGarble:
                     fout.write(line)
                     continue
 
-                if (line.startswith("class ") or " class " in line) and "{\n" in line:
+                if (line.startswith("class ") or " class " in line) and "{\n" in line and "//" not in line:
                     # 插入全局变量
                     for var in self.__variables:
                         line += "%s\n" % var
@@ -163,15 +163,14 @@ class JavaGarble:
                     curly_braces = line.count("{")
                     curly_braces -= line.count("}")
                     
-                keys = ignore_parts.keys()
-                for brace in keys:
-                    if ignore_parts < brace:
-                        ignore_parts.pop(brace)
+                for brace in ignore_parts.keys():
+                    if curly_braces < brace:
+                        ignore_parts[brace] = -10000
 
                 if "new" in line and "{\n" in line:
                     ignore_parts[curly_braces] = curly_braces
 
-                if curly_braces >= 1 and curly_braces not in ignore_parts.keys():
+                if curly_braces >= 1 and curly_braces not in ignore_parts.values():
                     if "return" in line:
                         curly_braces = -10000
                     elif ";\n" in line and len(line.replace(" ","")) > 10 and "//" not in line: