Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1178 from yurydelendik/santa

Refactoring fixes for SantaIsComing
  • Loading branch information...
commit 9e35c85130c0f45cab6e8139d75a9c79cb6b9f97 2 parents aa22c1e + 6760ee7
@yurydelendik yurydelendik authored
Showing with 4 additions and 4 deletions.
  1. +1 −1  src/avm2/parser.ts
  2. +1 −1  src/avm2/runtime.ts
  3. +2 −2 src/avm2/xml.js
View
2  src/avm2/parser.ts
@@ -417,7 +417,7 @@ module Shumway.AVM2.ABC {
// NOTE: We can't get the parameter name as described in the spec because
// some SWFs have invalid parameter names. Tamarin doesn't parse parameter
// names correctly, so we must follow that same behaviour.
- if (true) {
+ if (false) {
this.parameters[i].name = constantPool.strings[stream.readU30()];
} else {
stream.readU30();
View
2  src/avm2/runtime.ts
@@ -632,7 +632,7 @@ module Shumway.AVM2.Runtime {
case 10: return new c(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9]);
}
var applyArguments = [];
- for (var i = 0; args.length; i++) {
+ for (var i = 0; i < args.length; i++) {
applyArguments[i + 1] = args[i];
}
return new (Function.bind.apply(c, applyArguments));
View
4 src/avm2/xml.js
@@ -919,7 +919,7 @@ var isXMLType, isXMLName, XMLParser;
this.resolveMultinameProperty(mn.namespaces, mn.name, mn.flags);
return this[Multiname.getQualifiedName(resolved)];
}
- if (isNumeric(mn)) {
+ if (!Multiname.isQName(mn) && isNumeric(mn)) {
// this is a shortcut to the E4X logic that wants us to create a new
// XMLList with of size 1 and access it with the given index.
if (Number(0) === 0) {
@@ -961,7 +961,7 @@ var isXMLType, isXMLName, XMLParser;
this.resolveMultinameProperty(mn.namespaces, mn.name, mn.flags);
return !!this[Multiname.getQualifiedName(resolved)];
}
- if (isNumeric(mn)) {
+ if (!Multiname.isQName(mn) && isNumeric(mn)) {
// this is a shortcut to the E4X logic that wants us to create a new
// XMLList with of size 1 and access it with the given index.
if (Number(0) === 0) {
Please sign in to comment.
Something went wrong with that request. Please try again.