2
0
Prechádzať zdrojové kódy

More amberification and a recompile of FileServer.st.

Göran Krampe 12 rokov pred
rodič
commit
05613c2535
3 zmenil súbory, kde vykonal 316 pridanie a 212 odobranie
  1. 1 1
      bin/nodecompile.js
  2. 46 46
      server/FileServer.js
  3. 269 165
      server/server.js

+ 1 - 1
bin/nodecompile.js

@@ -1,4 +1,4 @@
-// NOTE: This code is called using the jtalkc bash script - do not use directly.
+// NOTE: This code is called using the amberc bash script - do not use directly.
 // The arguments variable is a series of .st filenames and category names.
 // If it is a .st file we import it, if it is a category name we export it
 // as aCategoryName.js.

+ 46 - 46
server/FileServer.js

@@ -1,8 +1,8 @@
 smalltalk.addClass('FileServer', smalltalk.Object, ['path', 'http', 'fs', 'url', 'port', 'basePath', 'sys'], 'FileServer');
 smalltalk.addMethod(
-'_basePath',
+unescape('_basePath'),
 smalltalk.method({
-selector: 'basePath',
+selector: unescape('basePath'),
 category: 'accessing',
 fn: function (){
 var self=this;
@@ -16,9 +16,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_basePath_',
+unescape('_basePath_'),
 smalltalk.method({
-selector: 'basePath:',
+selector: unescape('basePath%3A'),
 category: 'accessing',
 fn: function (aString){
 var self=this;
@@ -32,9 +32,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_port',
+unescape('_port'),
 smalltalk.method({
-selector: 'port',
+selector: unescape('port'),
 category: 'accessing',
 fn: function (){
 var self=this;
@@ -48,9 +48,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_initialize',
+unescape('_initialize'),
 smalltalk.method({
-selector: 'initialize',
+selector: unescape('initialize'),
 category: 'initialization',
 fn: function (){
 var self=this;
@@ -69,9 +69,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_require_',
+unescape('_require_'),
 smalltalk.method({
-selector: 'require:',
+selector: unescape('require%3A'),
 category: 'private',
 fn: function (aModuleString){
 var self=this;
@@ -85,9 +85,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_writeData_toFileNamed_',
+unescape('_writeData_toFileNamed_'),
 smalltalk.method({
-selector: 'writeData:toFileNamed:',
+selector: unescape('writeData%3AtoFileNamed%3A'),
 category: 'private',
 fn: function (data, aFilename){
 var self=this;
@@ -101,9 +101,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_respondNotFoundTo_',
+unescape('_respondNotFoundTo_'),
 smalltalk.method({
-selector: 'respondNotFoundTo:',
+selector: unescape('respondNotFoundTo%3A'),
 category: 'request handling',
 fn: function (aResponse){
 var self=this;
@@ -117,13 +117,13 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_handleRequest_respondTo_',
+unescape('_handleRequest_respondTo_'),
 smalltalk.method({
-selector: 'handleRequest:respondTo:',
+selector: unescape('handleRequest%3ArespondTo%3A'),
 category: 'request handling',
 fn: function (aRequest, aResponse){
 var self=this;
-(($receiver = smalltalk.send(smalltalk.send(aRequest, "_method", []), "__eq", ["PUT"])).klass === smalltalk.Boolean) ? ($receiver ? (function(){return smalltalk.send(self, "_handlePUTRequest_respondTo_", [aRequest, aResponse]);})() : (function(){return smalltalk.send(self, "_handleGETRequest_respondTo_", [aRequest, aResponse]);})()) : smalltalk.send($receiver, "_ifTrue_ifFalse_", [(function(){return smalltalk.send(self, "_handlePUTRequest_respondTo_", [aRequest, aResponse]);}), (function(){return smalltalk.send(self, "_handleGETRequest_respondTo_", [aRequest, aResponse]);})]);
+((($receiver = smalltalk.send(smalltalk.send(aRequest, "_method", []), "__eq", ["PUT"])).klass === smalltalk.Boolean) ? ($receiver ? (function(){return smalltalk.send(self, "_handlePUTRequest_respondTo_", [aRequest, aResponse]);})() : (function(){return smalltalk.send(self, "_handleGETRequest_respondTo_", [aRequest, aResponse]);})()) : smalltalk.send($receiver, "_ifTrue_ifFalse_", [(function(){return smalltalk.send(self, "_handlePUTRequest_respondTo_", [aRequest, aResponse]);}), (function(){return smalltalk.send(self, "_handleGETRequest_respondTo_", [aRequest, aResponse]);})]));
 return self;},
 args: ["aRequest", "aResponse"],
 source: unescape('handleRequest%3A%20aRequest%20respondTo%3A%20aResponse%0A%09aRequest%20method%20%3D%20%27PUT%27%0A%09%09ifTrue%3A%20%5Bself%20handlePUTRequest%3A%20aRequest%20respondTo%3A%20aResponse%5D%0A%09%09ifFalse%3A%20%5Bself%20handleGETRequest%3A%20aRequest%20respondTo%3A%20aResponse%5D'),
@@ -133,9 +133,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_handleGETRequest_respondTo_',
+unescape('_handleGETRequest_respondTo_'),
 smalltalk.method({
-selector: 'handleGETRequest:respondTo:',
+selector: unescape('handleGETRequest%3ArespondTo%3A'),
 category: 'request handling',
 fn: function (aRequest, aResponse){
 var self=this;
@@ -143,7 +143,7 @@ var uri=nil;
 var filename=nil;
 uri=smalltalk.send(smalltalk.send(self['@url'], "_parse_", [smalltalk.send(aRequest, "_url", [])]), "_pathname", []);
 filename=smalltalk.send(self['@path'], "_join_with_", [smalltalk.send(self, "_basePath", []), uri]);
-smalltalk.send(self['@path'], "_exists_do_", [filename, (function(boolean){return (($receiver = boolean).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(self, "_respondNotFoundTo_", [aResponse]);})() : (function(){return smalltalk.send(self, "_respondFileNamed_to_", [filename, aResponse]);})()) : smalltalk.send($receiver, "_ifFalse_ifTrue_", [(function(){return smalltalk.send(self, "_respondNotFoundTo_", [aResponse]);}), (function(){return smalltalk.send(self, "_respondFileNamed_to_", [filename, aResponse]);})]);})]);
+smalltalk.send(self['@path'], "_exists_do_", [filename, (function(boolean){return ((($receiver = boolean).klass === smalltalk.Boolean) ? (! $receiver ? (function(){return smalltalk.send(self, "_respondNotFoundTo_", [aResponse]);})() : (function(){return smalltalk.send(self, "_respondFileNamed_to_", [filename, aResponse]);})()) : smalltalk.send($receiver, "_ifFalse_ifTrue_", [(function(){return smalltalk.send(self, "_respondNotFoundTo_", [aResponse]);}), (function(){return smalltalk.send(self, "_respondFileNamed_to_", [filename, aResponse]);})]));})]);
 return self;},
 args: ["aRequest", "aResponse"],
 source: unescape('handleGETRequest%3A%20aRequest%20respondTo%3A%20aResponse%0A%09%7C%20uri%20filename%20%7C%0A%09uri%20%3A%3D%20%28url%20parse%3A%20aRequest%20url%29%20pathname.%0A%09filename%20%3A%3D%20path%20join%3A%20self%20basePath%20with%3A%20uri.%0A%09path%20exists%3A%20filename%20do%3A%20%5B%3Aboolean%20%7C%20%0A%09%09boolean%20%0A%09%09%09ifFalse%3A%20%5Bself%20respondNotFoundTo%3A%20aResponse%5D%0A%09%09%09ifTrue%3A%20%5Bself%20respondFileNamed%3A%20filename%20to%3A%20aResponse%5D%5D'),
@@ -153,9 +153,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_handlePUTRequest_respondTo_',
+unescape('_handlePUTRequest_respondTo_'),
 smalltalk.method({
-selector: 'handlePUTRequest:respondTo:',
+selector: unescape('handlePUTRequest%3ArespondTo%3A'),
 category: 'request handling',
 fn: function (aRequest, aResponse){
 var self=this;
@@ -173,17 +173,17 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_respondFileNamed_to_',
+unescape('_respondFileNamed_to_'),
 smalltalk.method({
-selector: 'respondFileNamed:to:',
+selector: unescape('respondFileNamed%3Ato%3A'),
 category: 'request handling',
 fn: function (aFilename, aResponse){
 var self=this;
 var type=nil;
 var filename=nil;
 filename=aFilename;
-(($receiver = smalltalk.send(smalltalk.send(self['@fs'], "_statSync_", [aFilename]), "_isDirectory", [])).klass === smalltalk.Boolean) ? ($receiver ? (function(){return filename=smalltalk.send(filename, "__comma", ["index.html"]);})() : nil) : smalltalk.send($receiver, "_ifTrue_", [(function(){return filename=smalltalk.send(filename, "__comma", ["index.html"]);})]);
-smalltalk.send(self['@fs'], "_readFile_do_", [filename, (function(ex, file){return (($receiver = smalltalk.send(ex, "_notNil", [])).klass === smalltalk.Boolean) ? ($receiver ? (function(){return smalltalk.send(self, "_respondInternalErrorTo_", [aResponse]);})() : (function(){type=smalltalk.send(smalltalk.send(self, "_class", []), "_mimeTypeFor_", [filename]);return (function($rec){smalltalk.send($rec, "_writeHead_options_", [(200), smalltalk.Dictionary._fromPairs_([smalltalk.send(unescape("Content-Type"), "__minus_gt", [type])])]);smalltalk.send($rec, "_write_binary_", [file, "binary"]);return smalltalk.send($rec, "_end", []);})(aResponse);})()) : smalltalk.send($receiver, "_ifTrue_ifFalse_", [(function(){return smalltalk.send(self, "_respondInternalErrorTo_", [aResponse]);}), (function(){type=smalltalk.send(smalltalk.send(self, "_class", []), "_mimeTypeFor_", [filename]);return (function($rec){smalltalk.send($rec, "_writeHead_options_", [(200), smalltalk.Dictionary._fromPairs_([smalltalk.send(unescape("Content-Type"), "__minus_gt", [type])])]);smalltalk.send($rec, "_write_binary_", [file, "binary"]);return smalltalk.send($rec, "_end", []);})(aResponse);})]);})]);
+((($receiver = smalltalk.send(smalltalk.send(self['@fs'], "_statSync_", [aFilename]), "_isDirectory", [])).klass === smalltalk.Boolean) ? ($receiver ? (function(){return filename=smalltalk.send(filename, "__comma", ["index.html"]);})() : nil) : smalltalk.send($receiver, "_ifTrue_", [(function(){return filename=smalltalk.send(filename, "__comma", ["index.html"]);})]));
+smalltalk.send(self['@fs'], "_readFile_do_", [filename, (function(ex, file){return ((($receiver = smalltalk.send(ex, "_notNil", [])).klass === smalltalk.Boolean) ? ($receiver ? (function(){return smalltalk.send(self, "_respondInternalErrorTo_", [aResponse]);})() : (function(){type=smalltalk.send(smalltalk.send(self, "_class", []), "_mimeTypeFor_", [filename]);return (function($rec){smalltalk.send($rec, "_writeHead_options_", [(200), smalltalk.Dictionary._fromPairs_([smalltalk.send(unescape("Content-Type"), "__minus_gt", [type])])]);smalltalk.send($rec, "_write_binary_", [file, "binary"]);return smalltalk.send($rec, "_end", []);})(aResponse);})()) : smalltalk.send($receiver, "_ifTrue_ifFalse_", [(function(){return smalltalk.send(self, "_respondInternalErrorTo_", [aResponse]);}), (function(){type=smalltalk.send(smalltalk.send(self, "_class", []), "_mimeTypeFor_", [filename]);return (function($rec){smalltalk.send($rec, "_writeHead_options_", [(200), smalltalk.Dictionary._fromPairs_([smalltalk.send(unescape("Content-Type"), "__minus_gt", [type])])]);smalltalk.send($rec, "_write_binary_", [file, "binary"]);return smalltalk.send($rec, "_end", []);})(aResponse);})]));})]);
 return self;},
 args: ["aFilename", "aResponse"],
 source: unescape('respondFileNamed%3A%20aFilename%20to%3A%20aResponse%0A%09%7C%20type%20filename%20%7C%0A%0A%09filename%20%3A%3D%20aFilename.%0A%09%28fs%20statSync%3A%20aFilename%29%20isDirectory%20ifTrue%3A%20%5B%0A%20%20%20%20%20%20%20%20%09filename%20%3A%3D%20filename%2C%20%27index.html%27%5D.%0A%0A%09fs%20readFile%3A%20filename%20do%3A%20%5B%3Aex%20%3Afile%20%7C%0A%09%09ex%20notNil%20%0A%09%09%09ifTrue%3A%20%5Bself%20respondInternalErrorTo%3A%20aResponse%5D%0A%09%09%09ifFalse%3A%20%5B%0A%20%20%20%20%20%20%20%20%09%09%09type%20%3A%3D%20self%20class%20mimeTypeFor%3A%20filename.%0A%09%09%09%09aResponse%20%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%09%09writeHead%3A%20200%20options%3A%20%20%23%7B%27Content-Type%27%20-%3E%20type%7D%3B%0A%09%09%09%09%09write%3A%20file%20binary%3A%20%27binary%27%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%09%09end%5D%5D'),
@@ -193,9 +193,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_respondInternalErrorTo_',
+unescape('_respondInternalErrorTo_'),
 smalltalk.method({
-selector: 'respondInternalErrorTo:',
+selector: unescape('respondInternalErrorTo%3A'),
 category: 'request handling',
 fn: function (aResponse){
 var self=this;
@@ -209,9 +209,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_respondOKTo_',
+unescape('_respondOKTo_'),
 smalltalk.method({
-selector: 'respondOKTo:',
+selector: unescape('respondOKTo%3A'),
 category: 'request handling',
 fn: function (aResponse){
 var self=this;
@@ -225,9 +225,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_startOn_',
+unescape('_startOn_'),
 smalltalk.method({
-selector: 'startOn:',
+selector: unescape('startOn%3A'),
 category: 'starting',
 fn: function (aPort){
 var self=this;
@@ -242,9 +242,9 @@ referencedClasses: []
 smalltalk.FileServer);
 
 smalltalk.addMethod(
-'_start',
+unescape('_start'),
 smalltalk.method({
-selector: 'start',
+selector: unescape('start'),
 category: 'starting',
 fn: function (){
 var self=this;
@@ -261,9 +261,9 @@ smalltalk.FileServer);
 
 smalltalk.FileServer.klass.iVarNames = ['port','mimeTypes'];
 smalltalk.addMethod(
-'_port',
+unescape('_port'),
 smalltalk.method({
-selector: 'port',
+selector: unescape('port'),
 category: 'accessing',
 fn: function (){
 var self=this;
@@ -277,9 +277,9 @@ referencedClasses: []
 smalltalk.FileServer.klass);
 
 smalltalk.addMethod(
-'_port_',
+unescape('_port_'),
 smalltalk.method({
-selector: 'port:',
+selector: unescape('port%3A'),
 category: 'accessing',
 fn: function (aNumber){
 var self=this;
@@ -293,9 +293,9 @@ referencedClasses: []
 smalltalk.FileServer.klass);
 
 smalltalk.addMethod(
-'_defaultMimeTypes',
+unescape('_defaultMimeTypes'),
 smalltalk.method({
-selector: 'defaultMimeTypes',
+selector: unescape('defaultMimeTypes'),
 category: 'accessing',
 fn: function (){
 var self=this;
@@ -309,9 +309,9 @@ referencedClasses: []
 smalltalk.FileServer.klass);
 
 smalltalk.addMethod(
-'_mimeTypes',
+unescape('_mimeTypes'),
 smalltalk.method({
-selector: 'mimeTypes',
+selector: unescape('mimeTypes'),
 category: 'accessing',
 fn: function (){
 var self=this;
@@ -325,9 +325,9 @@ referencedClasses: []
 smalltalk.FileServer.klass);
 
 smalltalk.addMethod(
-'_mimeTypeFor_',
+unescape('_mimeTypeFor_'),
 smalltalk.method({
-selector: 'mimeTypeFor:',
+selector: unescape('mimeTypeFor%3A'),
 category: 'accessing',
 fn: function (aString){
 var self=this;
@@ -341,9 +341,9 @@ referencedClasses: []
 smalltalk.FileServer.klass);
 
 smalltalk.addMethod(
-'_main',
+unescape('_main'),
 smalltalk.method({
-selector: 'main',
+selector: unescape('main'),
 category: 'initialization',
 fn: function (){
 var self=this;

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 269 - 165
server/server.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov