Skip to content

Commit

Permalink
Perlito5 - js2 - caret Var fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@fglock
fglock committed Nov 28, 2012
1 parent 22e3af4 commit aed21d6
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 20 deletions.
9 changes: 5 additions & 4 deletions html/perlito5.js
View file
Expand Up @@ -196,7 +196,7 @@ function p5scalar_deref(v) {
}
var c = v.charCodeAt(0);
if (c < 27) {
v = '^' + String.fromCharCode(c + 64) + v.substr(1);
v = String.fromCharCode(c + 64) + v.substr(1);
pkg_name = 'main';
}
return p5pkg[pkg_name]["v_"+v];
Expand All @@ -216,7 +216,7 @@ function p5scalar_deref_set(v, n) {
}
var c = v.charCodeAt(0);
if (c < 27) {
v = '^' + String.fromCharCode(c + 64) + v.substr(1);
v = String.fromCharCode(c + 64) + v.substr(1);
pkg_name = 'main';
}
p5pkg[pkg_name]["v_"+v] = n;
Expand All @@ -227,10 +227,12 @@ function p5scalar_deref_set(v, n) {
}

p5make_package("main");
p5make_package("Perlito5");
p5pkg["Perlito5"].v_PKG_NAME = "main";
p5pkg["main"]["v_@"] = []; // $@
p5pkg["main"]["v_|"] = 0; // $|
p5pkg["main"]["List_#"] = []; // @#
p5pkg["main"]["v_^O"] = isNode ? "node.js" : "javascript2";
p5scalar_deref_set(String.fromCharCode(15), isNode ? "node.js" : "javascript2"); // $^O
p5pkg["main"]["List_INC"] = [];
p5pkg["main"]["Hash_INC"] = {};
p5pkg["main"]["List_ARGV"] = [];
Expand All @@ -246,7 +248,6 @@ if (isNode) {
p5pkg["main"]["List_ARGV"] = arguments;
}

p5make_package("Perlito5");
p5make_package("Perlito5::IO");
p5make_package("Perlito5::Runtime");
p5make_package("Perlito5::Grammar");
Expand Down
4 changes: 2 additions & 2 deletions perlito5.pl
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions src5/lib/Perlito5/Javascript2/Runtime.pm
View file
Expand Up @@ -202,7 +202,7 @@ function p5scalar_deref(v) {
}
var c = v.charCodeAt(0);
if (c < 27) {
v = '^' + String.fromCharCode(c + 64) + v.substr(1);
v = String.fromCharCode(c + 64) + v.substr(1);
pkg_name = 'main';
}
return p5pkg[pkg_name]["v_"+v];
Expand All @@ -222,7 +222,7 @@ function p5scalar_deref_set(v, n) {
}
var c = v.charCodeAt(0);
if (c < 27) {
v = '^' + String.fromCharCode(c + 64) + v.substr(1);
v = String.fromCharCode(c + 64) + v.substr(1);
pkg_name = 'main';
}
p5pkg[pkg_name]["v_"+v] = n;
Expand All @@ -233,10 +233,12 @@ function p5scalar_deref_set(v, n) {
}
p5make_package("main");
p5make_package("Perlito5");
p5pkg["Perlito5"].v_PKG_NAME = "main";
p5pkg["main"]["v_@"] = []; // $@
p5pkg["main"]["v_|"] = 0; // $|
p5pkg["main"]["List_#"] = []; // @#
p5pkg["main"]["v_^O"] = isNode ? "node.js" : "javascript2";
p5scalar_deref_set(String.fromCharCode(15), isNode ? "node.js" : "javascript2"); // $^O
p5pkg["main"]["List_INC"] = [];
p5pkg["main"]["Hash_INC"] = {};
p5pkg["main"]["List_ARGV"] = [];
Expand All @@ -252,7 +254,6 @@ if (isNode) {
p5pkg["main"]["List_ARGV"] = arguments;
}
p5make_package("Perlito5");
p5make_package("Perlito5::IO");
p5make_package("Perlito5::Runtime");
p5make_package("Perlito5::Grammar");
Expand Down
34 changes: 24 additions & 10 deletions src5/lib/Perlito5/Javascript3/Runtime.pm
View file
Expand Up @@ -210,11 +210,18 @@ function p5scalar_deref(v) {
if (typeof v === "string") {
var pkg_name = v.split(/::/);
if (pkg_name.length > 1) {
var name = pkg_name.pop();
v = pkg_name.pop();
pkg_name = pkg_name.join("::");
return p5pkg[pkg_name]["v_"+name];
}
return p5pkg[p5pkg["Perlito5"].v_PKG_NAME]["v_"+v];
else {
pkg_name = p5pkg["Perlito5"].v_PKG_NAME;
}
var c = v.charCodeAt(0);
if (c < 27) {
v = String.fromCharCode(c + 64) + v.substr(1);
pkg_name = 'main';
}
return p5pkg[pkg_name]["v_"+v];
}
return v._scalar_;
}
Expand All @@ -223,23 +230,31 @@ function p5scalar_deref_set(v, n) {
if (typeof v === "string") {
var pkg_name = v.split(/::/);
if (pkg_name.length > 1) {
var name = pkg_name.pop();
v = pkg_name.pop();
pkg_name = pkg_name.join("::");
p5pkg[pkg_name]["v_"+name] = n;
return p5pkg[pkg_name]["v_"+name];
}
p5pkg[p5pkg["Perlito5"].v_PKG_NAME]["v_"+v] = n;
return p5pkg[p5pkg["Perlito5"].v_PKG_NAME]["v_"+v];
else {
pkg_name = p5pkg["Perlito5"].v_PKG_NAME;
}
var c = v.charCodeAt(0);
if (c < 27) {
v = String.fromCharCode(c + 64) + v.substr(1);
pkg_name = 'main';
}
p5pkg[pkg_name]["v_"+v] = n;
return p5pkg[pkg_name]["v_"+v];
}
v._scalar_ = n;
return v._scalar_;
}
p5make_package("main");
p5make_package("Perlito5");
p5pkg["Perlito5"].v_PKG_NAME = "main";
p5pkg["main"]["v_@"] = new p5Scalar(""); // $@
p5pkg["main"]["v_|"] = new p5Scalar(0); // $|
p5pkg["main"]["List_#"] = new p5Array([]); // @#
p5pkg["main"]["v_^O"] = new p5Scalar(isNode ? "node.js" : "javascript3");
p5scalar_deref_set(String.fromCharCode(15), isNode ? "node.js" : "javascript2"); // $^O
p5pkg["main"]["List_INC"] = new p5Array([]);
p5pkg["main"]["Hash_INC"] = new p5Hash({});
p5pkg["main"]["List_ARGV"] = new p5Array([]);
Expand All @@ -252,7 +267,6 @@ if (isNode) {
p5pkg["main"]["List_ARGV"] = new p5Array(arguments);
}
p5make_package("Perlito5");
p5make_package("Perlito5::IO");
p5make_package("Perlito5::Runtime");
p5make_package("Perlito5::Grammar");
Expand Down

0 comments on commit aed21d6

Please sign in to comment.