From 92a6661b4750f2791e16895cb81afd36eb2a150b Mon Sep 17 00:00:00 2001
From: echicken <>
Date: Sat, 1 Sep 2012 02:02:46 +0000
Subject: [PATCH] xjs_compile() has been moved into exec/load/xjs.js.
---
exec/xjs_handler.js | 92 +--------------------------------------------
1 file changed, 1 insertion(+), 91 deletions(-)
diff --git a/exec/xjs_handler.js b/exec/xjs_handler.js
index 97e2960ccb..00c6e82ab4 100644
--- a/exec/xjs_handler.js
+++ b/exec/xjs_handler.js
@@ -2,6 +2,7 @@
/* $Id$ */
+load("xjs.js");
var xjs_filename;
if(this.http_request!==undefined) /* Requested through web-server */
@@ -11,97 +12,6 @@ else
var cwd='';
-function xjs_compile(filename) {
- if(cwd != '') {
- if(filename.search(/^((\/)|([A-Za-z]:[\/\\]))/)==-1)
- filename=cwd+filename;
- }
- cwd=filename;
- cwd=backslash(cwd.replace(/[^\\\/]*$/,''));
- var ssjs_filename=filename+".ssjs";
-
- // Probably a race condition on Win32
- if(file_exists(ssjs_filename)) {
- if(file_date(ssjs_filename)<=file_date(filename)) {
- file_remove(ssjs_filename);
- }
- }
-
- if(!file_exists(ssjs_filename)) {
- var file = new File(filename);
- if(!file.open("r",true,8192)) {
- writeln("!ERROR " + file.error + " opening " + filename);
- exit();
- }
- var text = file.readAll(8192);
- file.close();
-
- var script="";
-
- var in_xjs=false;
- for (line in text) {
- var str=text[line];
- while(str != '') {
- if(!in_xjs) {
- if(str.search(/<\?(xjs)?\s+/)==-1) {
- var ln=true;
- if(str.substr(-5)=='<?xjs') {
- str=str.substr(0, str.length-5);
- in_xjs=true;
- ln=false;
- }
- else if(str.substr(-2)=='<?') {
- str=str.substr(0, str.length-2);
- in_xjs=true;
- ln=false;
- }
- if(str != '') {
- if(ln)
- script += "writeln("+str.toSource()+");";
- else
- script += "write("+str.toSource()+");";
- }
- str='';
- }
- else {
- str=str.replace(/^(.*?)<\?(xjs)?\s+/,
- function (str, p1, p2, offset, s) {
- if(p1 != '')
- script += "write("+p1.toSource()+");";
- in_xjs=true;
- return '';
- }
- );
- }
- }
- else {
- if(str.search(/\?>/)==-1) {
- script += str;
- str='';
- }
- else {
- str=str.replace(/^(.*?)\?>/,
- function (str, p1, offset, s) {
- script += p1+";";
- in_xjs=false;
- return '';
- }
- );
- }
- }
- }
- script += '\n';
- }
-
- var f=new File(ssjs_filename);
- if(f.open("w",false)) {
- f.write(script);
- f.close();
- }
- }
- return(ssjs_filename);
-}
-
function xjs_load(filename)
{
var old_cwd=cwd;
--
GitLab