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

hack for long string literals in C bugs in JS. Fixed.

Browse source
This commit is contained in:
Simon Hafner 2013-02-08 17:57:08 -06:00
commit 3f101feb01
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/ecmasgen.nim
View file

@ -140,6 +140,8 @@ proc mangleName(s: PSym): PRope =
app(result, toRope(s.id)) app(result, toRope(s.id))
s.loc.r = result s.loc.r = result
proc makeJSString(s: string): PRope = strutils.escape(s).toRope
proc genTypeInfo(p: var TProc, typ: PType): PRope proc genTypeInfo(p: var TProc, typ: PType): PRope
proc genObjectFields(p: var TProc, typ: PType, n: PNode): PRope = proc genObjectFields(p: var TProc, typ: PType, n: PNode): PRope =
var var
@ -165,7 +167,7 @@ proc genObjectFields(p: var TProc, typ: PType, n: PNode): PRope =
s = genTypeInfo(p, field.typ) s = genTypeInfo(p, field.typ)
result = ropef("{kind: 1, offset: \"$1\", len: 0, " & result = ropef("{kind: 1, offset: \"$1\", len: 0, " &
"typ: $2, name: $3, sons: null}", "typ: $2, name: $3, sons: null}",
[mangleName(field), s, makeCString(field.name.s)]) [mangleName(field), s, makeJSString(field.name.s)])
of nkRecCase: of nkRecCase:
length = sonsLen(n) length = sonsLen(n)
if (n.sons[0].kind != nkSym): InternalError(n.info, "genObjectFields") if (n.sons[0].kind != nkSym): InternalError(n.info, "genObjectFields")
@ -193,7 +195,7 @@ proc genObjectFields(p: var TProc, typ: PType, n: PNode): PRope =
[u, genObjectFields(p, typ, lastSon(b))]) [u, genObjectFields(p, typ, lastSon(b))])
result = ropef("{kind: 3, offset: \"$1\", len: $3, " & result = ropef("{kind: 3, offset: \"$1\", len: $3, " &
"typ: $2, name: $4, sons: [$5]}", [mangleName(field), s, "typ: $2, name: $4, sons: [$5]}", [mangleName(field), s,
toRope(lengthOrd(field.typ)), makeCString(field.name.s), result]) toRope(lengthOrd(field.typ)), makeJSString(field.name.s), result])
else: internalError(n.info, "genObjectFields") else: internalError(n.info, "genObjectFields")
proc genObjectInfo(p: var TProc, typ: PType, name: PRope) = proc genObjectInfo(p: var TProc, typ: PType, name: PRope) =
@ -234,7 +236,7 @@ proc genEnumInfo(p: var TProc, typ: PType, name: PRope) =
if i > 0: app(s, ", " & tnl) if i > 0: app(s, ", " & tnl)
let extName = if field.ast == nil: field.name.s else: field.ast.strVal let extName = if field.ast == nil: field.name.s else: field.ast.strVal
appf(s, "{kind: 1, offset: $1, typ: $2, name: $3, len: 0, sons: null}", appf(s, "{kind: 1, offset: $1, typ: $2, name: $3, len: 0, sons: null}",
[toRope(field.position), name, makeCString(extName)]) [toRope(field.position), name, makeJSString(extName)])
var n = ropef("var NNI$1 = {kind: 2, offset: 0, typ: null, " & var n = ropef("var NNI$1 = {kind: 2, offset: 0, typ: null, " &
"name: null, len: $2, sons: [$3]};$n", [toRope(typ.id), toRope(length), s]) "name: null, len: $2, sons: [$3]};$n", [toRope(typ.id), toRope(length), s])
s = ropef("var $1 = {size: 0, kind: $2, base: null, node: null, " & s = ropef("var $1 = {size: 0, kind: $2, base: null, node: null, " &
@ -588,7 +590,7 @@ proc genRaiseStmt(p: var TProc, n: PNode, r: var TCompRes) =
typ = skipTypes(n.sons[0].typ, abstractPtrs) typ = skipTypes(n.sons[0].typ, abstractPtrs)
useMagic(p, "raiseException") useMagic(p, "raiseException")
appf(r.com, "raiseException($1, $2);$n", appf(r.com, "raiseException($1, $2);$n",
[a.res, makeCString(typ.sym.name.s)]) [a.res, makeJSString(typ.sym.name.s)])
else: else:
useMagic(p, "reraiseException") useMagic(p, "reraiseException")
app(r.com, "reraiseException();" & tnl) app(r.com, "reraiseException();" & tnl)
@ -626,7 +628,7 @@ proc genCaseStmt(p: var TProc, n: PNode, r: var TCompRes) =
if stringSwitch: if stringSwitch:
case e.kind case e.kind
of nkStrLit..nkTripleStrLit: appf(r.com, "case $1: ", of nkStrLit..nkTripleStrLit: appf(r.com, "case $1: ",
[makeCString(e.strVal)]) [makeJSString(e.strVal)])
else: InternalError(e.info, "ecmasgen.genCaseStmt: 2") else: InternalError(e.info, "ecmasgen.genCaseStmt: 2")
else: else:
appf(r.com, "case $1: ", [cond.res]) appf(r.com, "case $1: ", [cond.res])
@ -827,12 +829,12 @@ proc genFieldAddr(p: var TProc, n: PNode, r: var TCompRes) =
var b = if n.kind == nkHiddenAddr: n.sons[0] else: n var b = if n.kind == nkHiddenAddr: n.sons[0] else: n
gen(p, b.sons[0], a) gen(p, b.sons[0], a)
if skipTypes(b.sons[0].typ, abstractVarRange).kind == tyTuple: if skipTypes(b.sons[0].typ, abstractVarRange).kind == tyTuple:
r.res = makeCString("Field" & $getFieldPosition(b.sons[1])) r.res = makeJSString("Field" & $getFieldPosition(b.sons[1]))
else: else:
if b.sons[1].kind != nkSym: InternalError(b.sons[1].info, "genFieldAddr") if b.sons[1].kind != nkSym: InternalError(b.sons[1].info, "genFieldAddr")
var f = b.sons[1].sym var f = b.sons[1].sym
if f.loc.r == nil: f.loc.r = mangleName(f) if f.loc.r == nil: f.loc.r = mangleName(f)
r.res = makeCString(ropeToStr(f.loc.r)) r.res = makeJSString(ropeToStr(f.loc.r))
r.com = mergeExpr(a) r.com = mergeExpr(a)
proc genFieldAccess(p: var TProc, n: PNode, r: var TCompRes) = proc genFieldAccess(p: var TProc, n: PNode, r: var TCompRes) =
@ -903,7 +905,7 @@ proc genAddr(p: var TProc, n: PNode, r: var TCompRes) =
# globals are always indirect accessible # globals are always indirect accessible
r.kind = etyBaseIndex r.kind = etyBaseIndex
r.com = toRope("Globals") r.com = toRope("Globals")
r.res = makeCString(ropeToStr(s.loc.r)) r.res = makeJSString(ropeToStr(s.loc.r))
elif sfAddrTaken in s.flags: elif sfAddrTaken in s.flags:
r.kind = etyBaseIndex r.kind = etyBaseIndex
r.com = s.loc.r r.com = s.loc.r
@ -1422,8 +1424,8 @@ proc genReturnStmt(p: var TProc, n: PNode, r: var TCompRes) =
proc genProcBody(p: var TProc, prc: PSym, r: TCompRes): PRope = proc genProcBody(p: var TProc, prc: PSym, r: TCompRes): PRope =
if optStackTrace in prc.options: if optStackTrace in prc.options:
result = ropef("var F={procname:$1,prev:framePtr,filename:$2,line:0};$n" & result = ropef("var F={procname:$1,prev:framePtr,filename:$2,line:0};$n" &
"framePtr = F;$n", [makeCString(prc.owner.name.s & '.' & prc.name.s), "framePtr = F;$n", [makeJSString(prc.owner.name.s & '.' & prc.name.s),
makeCString(toFilename(prc.info))]) makeJSString(toFilename(prc.info))])
else: else:
result = nil result = nil
if p.beforeRetNeeded: if p.beforeRetNeeded:
@ -1540,9 +1542,9 @@ proc gen(p: var TProc, n: PNode, r: var TCompRes) =
of nkStrLit..nkTripleStrLit: of nkStrLit..nkTripleStrLit:
if skipTypes(n.typ, abstractVarRange).kind == tyString: if skipTypes(n.typ, abstractVarRange).kind == tyString:
useMagic(p, "cstrToNimstr") useMagic(p, "cstrToNimstr")
r.res = ropef("cstrToNimstr($1)", [makeCString(n.strVal)]) r.res = ropef("cstrToNimstr($1)", [makeJSString(n.strVal)])
else: else:
r.res = makeCString(n.strVal) r.res = makeJSString(n.strVal)
of nkFloatLit..nkFloat64Lit: of nkFloatLit..nkFloat64Lit:
f = n.floatVal f = n.floatVal
if f != f: r.res = toRope"NaN" if f != f: r.res = toRope"NaN"
@ -1611,8 +1613,8 @@ proc genModule(p: var TProc, n: PNode, r: var TCompRes) =
if optStackTrace in p.options: if optStackTrace in p.options:
r.com = ropef("var F = {procname:$1,prev:framePtr,filename:$2,line:0};$n" & r.com = ropef("var F = {procname:$1,prev:framePtr,filename:$2,line:0};$n" &
"framePtr = F;$n" & "$3" & "framePtr = framePtr.prev;$n", [ "framePtr = F;$n" & "$3" & "framePtr = framePtr.prev;$n", [
makeCString("module " & p.module.module.name.s), makeJSString("module " & p.module.module.name.s),
makeCString(toFilename(p.module.module.info)), r.com]) makeJSString(toFilename(p.module.module.info)), r.com])
proc myProcess(b: PPassContext, n: PNode): PNode = proc myProcess(b: PPassContext, n: PNode): PNode =
if passes.skipCodegen(n): return n if passes.skipCodegen(n): return n