diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-04-29 17:14:08 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-29 17:14:08 -0700 |
commit | 60960a6a1f5137239af6b11d91d1ca668f54f5f1 (patch) | |
tree | 76bac93f97480cc84b780070985e7bce0092131b /src/jsifier.js | |
parent | d6ea75e7f22a5efdfe689ed65e5b1cb0806762f2 (diff) |
do not get confused by local vars that alias names of library functions, and are used as function pointers
Diffstat (limited to 'src/jsifier.js')
-rw-r--r-- | src/jsifier.js | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index 3f47e967..350d2c8b 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -1326,16 +1326,21 @@ function JSify(data, functionsOnly, givenFunctions) { ident = Variables.resolveAliasToIdent(ident); var shortident = ident.slice(1); var simpleIdent = shortident; - var callIdent = LibraryManager.getRootIdent(simpleIdent); - if (callIdent) { - simpleIdent = callIdent; // ident may not be in library, if all there is is ident__inline, but in this case it is - if (callIdent.indexOf('.') < 0) { - callIdent = '_' + callIdent; // Not Math.*, so add the normal prefix - } + if (isLocalVar(ident)) { + var callIdent = ident; } else { - callIdent = ident; + // Not a local var, check if in library + var callIdent = LibraryManager.getRootIdent(simpleIdent); + if (callIdent) { + simpleIdent = callIdent; // ident may not be in library, if all there is is ident__inline, but in this case it is + if (callIdent.indexOf('.') < 0) { + callIdent = '_' + callIdent; // Not Math.*, so add the normal prefix + } + } else { + callIdent = ident; + } + if (callIdent == '0') return 'abort(-2)'; } - if (callIdent == '0') return 'abort(-2)'; var args = []; var argsTypes = []; |