Generate legal names when obfuscating (#10522)

Fixes #10513
OpenModelica · Apr 11, 2023 · 1cf1bc7 · 1cf1bc7
1 parent 0807f0f
commit 1cf1bc7
Show file tree

Hide file tree

Showing 4 changed files with 3,897 additions and 3,902 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo b/OMCompiler/Compiler/NFFrontEnd/NFFlatModel.mo
@@ -730,7 +730,7 @@ public
       nodes := List.trim(nodes, InstNode.isPublic);
 
       for node in nodes loop
-        UnorderedMap.tryAdd(node, "$n" + String(UnorderedMap.size(obfuscationMap) + 1), obfuscationMap);
+        UnorderedMap.tryAdd(node, "n" + String(UnorderedMap.size(obfuscationMap) + 1), obfuscationMap);
       end for;
     end if;
   end addObfuscatedVariable;

diff --git a/OMCompiler/Compiler/Script/Obfuscate.mo b/OMCompiler/Compiler/Script/Obfuscate.mo
@@ -32,7 +32,6 @@
 encapsulated package Obfuscate
   import Absyn;
   import AbsynUtil;
-  import DAE;
   import Dump;
   import FBuiltin;
   import SCode;
@@ -489,7 +488,7 @@ encapsulated package Obfuscate
     if isSome(oldId) then
       SOME(id) := oldId;
     else
-      id := "$n" + String(index);
+      id := "n" + String(index);
     end if;
   end makeId;
 
@@ -1016,9 +1015,5 @@ encapsulated package Obfuscate
     res := ety == ElementType.FUNCTION or ety == ElementType.TYPE_AND_FUNCTION;
   end isBuiltinCall;
 
-  function deobfuscatePublicDAEVars
-
-  end deobfuscatePublicDAEVars;
-
   annotation(__OpenModelica_Interface="backend");
 end Obfuscate;