jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove my wrongly written mangled-related code, not needed anymore (#13858)

Browse source
This commit is contained in:
Alexander Ivanov 2020-04-03 21:22:03 +03:00 • committed by GitHub
commit cec320b569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/jsgen.nim
View file

@ -205,8 +205,6 @@ proc mapType(typ: PType): TJSTypeKind =
proc mapType(p: PProc; typ: PType): TJSTypeKind = proc mapType(p: PProc; typ: PType): TJSTypeKind =
result = mapType(typ) result = mapType(typ)
var mangled = initSet[string]()
proc mangleName(m: BModule, s: PSym): Rope = proc mangleName(m: BModule, s: PSym): Rope =
proc validJsName(name: string): bool = proc validJsName(name: string): bool =
result = true result = true
@ -261,11 +259,6 @@ proc mangleName(m: BModule, s: PSym): Rope =
result.add(rope(s.id)) result.add(rope(s.id))
s.loc.r = result s.loc.r = result
# TODO: optimize
let s = $result
if '_' in s:
mangled.incl(s)
proc escapeJSString(s: string): string = proc escapeJSString(s: string): string =
result = newStringOfCap(s.len + s.len shr 2) result = newStringOfCap(s.len + s.len shr 2)
result.add("\"") result.add("\"")
@ -2609,7 +2602,7 @@ proc myClose(graph: ModuleGraph; b: PPassContext, n: PNode): PNode =
if optSourcemap in m.config.globalOptions: if optSourcemap in m.config.globalOptions:
var map: SourceMap var map: SourceMap
(code, map) = genSourceMap($(code), mangled, outFile.string) (code, map) = genSourceMap($(code), outFile.string)
writeFile(outFile.string & ".map", $(%map)) writeFile(outFile.string & ".map", $(%map))
discard writeRopeIfNotEqual(code, outFile) discard writeRopeIfNotEqual(code, outFile)

6
compiler/sourcemap.nim
View file

@ -158,7 +158,7 @@ iterator tokenize*(line: string): (bool, string) =
if token.len > 0: if token.len > 0:
yield (isMangled, token) yield (isMangled, token)
proc parse*(source: string, path: string, mangled: HashSet[string]): SourceNode = proc parse*(source: string, path: string): SourceNode =
let lines = source.splitLines() let lines = source.splitLines()
var lastLocation: SourceNode = nil var lastLocation: SourceNode = nil
result = newSourceNode(0, 0, path, @[]) result = newSourceNode(0, 0, path, @[])
@ -378,8 +378,8 @@ proc toSourceMap*(node: SourceNode, file: string): SourceMapGenerator =
map map
proc genSourceMap*(source: string, mangled: HashSet[string], outFile: string): (Rope, SourceMap) = proc genSourceMap*(source: string, outFile: string): (Rope, SourceMap) =
let node = parse(source, outFile, mangled) let node = parse(source, outFile)
let map = node.toSourceMap(file = outFile) let map = node.toSourceMap(file = outFile)
((&"{source}\n//# sourceMappingURL={outFile}.map").rope, map.gen) ((&"{source}\n//# sourceMappingURL={outFile}.map").rope, map.gen)