Skip to content

Commit

Permalink
fix: indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@zlataovce
zlataovce committed Sep 2, 2024
1 parent 806f7e5 commit dee610a
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 82 deletions.
82 changes: 41 additions & 41 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
const krakScript = `from pyodide.http import pyfetch
response = await pyfetch("https://cdn.jsdelivr.net/gh/run-slicer/script-krak@${"1.0.0"}/dist/krak.zip")
await response.unpack_archive()
response = await pyfetch("https://cdn.jsdelivr.net/gh/run-slicer/script-krak@${"1.0.1"}/dist/krak.zip")
await response.unpack_archive()
from Krakatau.java.visitor import DefaultVisitor
from Krakatau.java.javaclass import generateAST
from Krakatau.ssa import ssaFromVerified
from Krakatau.verifier.inference_verifier import verifyBytecode
from Krakatau.java.stringescape import escapeString
from Krakatau.environment import Environment
from Krakatau.classfile import ClassFile
from Krakatau.classfileformat.reader import Reader
from Krakatau.java.visitor import DefaultVisitor
from Krakatau.java.javaclass import generateAST
from Krakatau.ssa import ssaFromVerified
from Krakatau.verifier.inference_verifier import verifyBytecode
from Krakatau.java.stringescape import escapeString
from Krakatau.environment import Environment
from Krakatau.classfile import ClassFile
from Krakatau.classfileformat.reader import Reader
def makeGraph(m):
v = verifyBytecode(m.code)
s = ssaFromVerified(m.code, v, opts=False)
def makeGraph(m):
v = verifyBytecode(m.code)
s = ssaFromVerified(m.code, v, opts=False)
if s.procs:
s.inlineSubprocs()
if s.procs:
s.inlineSubprocs()
s.condenseBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
s.condenseBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
s.copyPropagation()
s.abstractInterpert()
s.disconnectConstantVariables()
s.copyPropagation()
s.abstractInterpert()
s.disconnectConstantVariables()
s.simplifyThrows()
s.simplifyCatchIgnored()
s.mergeSingleSuccessorBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
s.simplifyThrows()
s.simplifyCatchIgnored()
s.mergeSingleSuccessorBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
return s
return s
def decompile(data):
e = Environment()
def decompile(data):
e = Environment()
c = ClassFile(Reader(data=bytes(data.to_py())))
c.env = e
c = ClassFile(Reader(data=bytes(data.to_py())))
c.env = e
e.classes[c.name] = c
e.classes[c.name] = c
c.loadElements()
c.loadElements()
printer = DefaultVisitor()
source = printer.visit(generateAST(c, makeGraph, skip_errors=True))
printer = DefaultVisitor()
source = printer.visit(generateAST(c, makeGraph, skip_errors=True))
if '/' in c.name:
return f'package {escapeString(c.name.replace('/','.').rpartition('.')[0])};\\n\\n{source}'
if '/' in c.name:
return f'package {escapeString(c.name.replace('/','.').rpartition('.')[0])};\\n\\n{source}'
return source
return source
decompile`;
decompile`;
let decompileFunc = null;
const krak = {
id: "krak",
Expand All @@ -68,9 +68,9 @@ const krak = {
},
};
var index = {
name: "script-krak",
name: "krak",
description: "A script binding for the Krakatau Java decompiler.",
version: "1.0.0",
version: "1.0.1",
load(context) {
context.disasm.add(krak);
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "script-krak",
"version": "1.0.0",
"version": "1.0.1",
"type": "module",
"author": "run-slicer",
"license": "GPL-3.0-only",
Expand Down
80 changes: 40 additions & 40 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
import type { Disassembler, Script, ScriptContext } from "@run-slicer/script";

const krakScript = `from pyodide.http import pyfetch
response = await pyfetch("https://cdn.jsdelivr.net/gh/run-slicer/script-krak@${__SCRIPT_VERSION__}/dist/krak.zip")
await response.unpack_archive()
response = await pyfetch("https://cdn.jsdelivr.net/gh/run-slicer/script-krak@${__SCRIPT_VERSION__}/dist/krak.zip")
await response.unpack_archive()
from Krakatau.java.visitor import DefaultVisitor
from Krakatau.java.javaclass import generateAST
from Krakatau.ssa import ssaFromVerified
from Krakatau.verifier.inference_verifier import verifyBytecode
from Krakatau.java.stringescape import escapeString
from Krakatau.environment import Environment
from Krakatau.classfile import ClassFile
from Krakatau.classfileformat.reader import Reader
from Krakatau.java.visitor import DefaultVisitor
from Krakatau.java.javaclass import generateAST
from Krakatau.ssa import ssaFromVerified
from Krakatau.verifier.inference_verifier import verifyBytecode
from Krakatau.java.stringescape import escapeString
from Krakatau.environment import Environment
from Krakatau.classfile import ClassFile
from Krakatau.classfileformat.reader import Reader
def makeGraph(m):
v = verifyBytecode(m.code)
s = ssaFromVerified(m.code, v, opts=False)
def makeGraph(m):
v = verifyBytecode(m.code)
s = ssaFromVerified(m.code, v, opts=False)
if s.procs:
s.inlineSubprocs()
if s.procs:
s.inlineSubprocs()
s.condenseBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
s.condenseBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
s.copyPropagation()
s.abstractInterpert()
s.disconnectConstantVariables()
s.copyPropagation()
s.abstractInterpert()
s.disconnectConstantVariables()
s.simplifyThrows()
s.simplifyCatchIgnored()
s.mergeSingleSuccessorBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
s.simplifyThrows()
s.simplifyCatchIgnored()
s.mergeSingleSuccessorBlocks()
s.mergeSingleSuccessorBlocks()
s.removeUnusedVariables()
return s
return s
def decompile(data):
e = Environment()
def decompile(data):
e = Environment()
c = ClassFile(Reader(data=bytes(data.to_py())))
c.env = e
c = ClassFile(Reader(data=bytes(data.to_py())))
c.env = e
e.classes[c.name] = c
e.classes[c.name] = c
c.loadElements()
c.loadElements()
printer = DefaultVisitor()
source = printer.visit(generateAST(c, makeGraph, skip_errors=True))
printer = DefaultVisitor()
source = printer.visit(generateAST(c, makeGraph, skip_errors=True))
if '/' in c.name:
return f'package {escapeString(c.name.replace('/','.').rpartition('.')[0])};\\n\\n{source}'
if '/' in c.name:
return f'package {escapeString(c.name.replace('/','.').rpartition('.')[0])};\\n\\n{source}'
return source
return source
decompile`;
decompile`;

let decompileFunc: ((data: Uint8Array) => string) | null = null;

Expand All @@ -74,7 +74,7 @@ const krak: Disassembler = {
};

export default {
name: "script-krak",
name: "krak",
description: "A script binding for the Krakatau Java decompiler.",
version: __SCRIPT_VERSION__,
load(context: ScriptContext): void | Promise<void> {
Expand Down

0 comments on commit dee610a

Please sign in to comment.