Home Explore Help
Register Sign In
francis
/
amber
forked from amber/amber
1
0
Fork 0
Files
Browse Source

Trying to rewrite trivialserver using Smalltalk syntax, problems.

Göran Krampe 13 years ago
parent
08e8f030e5
commit
306437336c
8 changed files with 23 additions and 95 deletions
Unified View Show Diff Stats
  1. 2 2
      nodejs/trivialserver/Makefile
  2. 0 18
      nodejs/trivialserver/README
  3. 21 4
      nodejs/trivialserver/TrivialServer.st
  4. 0 9
      nodejs/trivialserver/main.js
  5. 0 8
      nodejs/trivialserver2/Makefile
  6. 0 4
      nodejs/trivialserver2/README
  7. 0 49
      nodejs/trivialserver2/TrivialServer.st
  8. 0 1
      nodejs/trivialserver2/trivial

+ 2 - 2
nodejs/trivialserver/Makefile
View File 

@@ -1,5 +1,5 @@
 
-Program.js: TrivialServer.st main.js
 
-	../jtalkc -N -M main.js TrivialServer.st Program
 
+Program.js: TrivialServer.st
 
+	../../bin/jtalkc -N -m TrivialServer TrivialServer.st Program
 
 
 
 run: Program.js
 
 run: Program.js
 
 	./trivial
 
 	./trivial

+ 0 - 18
nodejs/trivialserver/README
View File 

@@ -1,18 +0,0 @@
 
-Trivial Node.js example in JTalk:
 
-
 
-TrivialServer.st - source code.
 
-trivial          - trivial bash script to run resulting program.
 
-main.js          - small "doit" to actually run code. Will be added by ntalkc.
 
-Makefile         - trivial makefile, read it.
 
-
 
-TrivialServer.js - produced when you run make.
 
-Program.js       - Contains JTalk + TrivialServer.js + main.js
 
-
 
-To play, do this:
 
-
 
-make run
 
-
 
-...or:
 
-
 
-make
 
-./trivial

+ 21 - 4
nodejs/trivialserver/TrivialServer.st
View File 

@@ -9,15 +9,14 @@ initialize
 
 
 
 !TrivialServer methodsFor: 'processing'!
 
 !TrivialServer methodsFor: 'processing'!
 
 process: aRequest
 
 process: aRequest
 
-
 
         | hostname httpVersion stream |
 
         | hostname httpVersion stream |
 
 	counter := counter + 1.
 
 	counter := counter + 1.
 
 
 
         "Calling a method in a js module"
 
         "Calling a method in a js module"
 
-	hostname := {'os.hostname()'}.
 
+	hostname := os hostname.
 
 
 
         "Accessing a property of js HTTP request object"
 
         "Accessing a property of js HTTP request object"
 
-        httpVersion := {'aRequest.httpVersion'}.
 
+        httpVersion := aRequest httpVersion.
 
 
 
         stream := String new writeStream.
 
         stream := String new writeStream.
 
 	stream
 
 	stream
 
@@ -25,9 +24,27 @@ process: aRequest
 
 		nextPutAll: '<p>OS hostname: ', hostname, '</p>';
 
 		nextPutAll: '<p>OS hostname: ', hostname, '</p>';
 
 		nextPutAll: '<p>Number of requests: ', counter asString, '</p></html>'.
 
 		nextPutAll: '<p>Number of requests: ', counter asString, '</p></html>'.
 
 	^stream contents
 
 	^stream contents
 
+!
 
+
 
+start
 
+        | block obj |
 
+        block := [:req :res |
 
+           {'res.writeHead(200, {''Content-Type'': ''text/html''});'}.
 
+           res end: (self process: req)].
 
+
 
+        (http createServer: block)
 
+                listen: #(1337 '127.0.0.1').
 
+        console log: 'TrivialServer running at http://127.0.0.1:1337/'
 
 ! !
 
 ! !
 
 
 
+
 
 !TrivialServer class methodsFor: 'initialization'!
 
 !TrivialServer class methodsFor: 'initialization'!
 
 initialize
 
 initialize
 
-	{'os = require(''os'');'}
 
+        "We require these Node modules."
 
+
 
+	{'os = require(''os''), http = require(''http'');'}
 
+!
 
+
 
+main
 
+	self new start
 
 ! !
 
 ! !

+ 0 - 9
nodejs/trivialserver/main.js
View File 

@@ -1,9 +0,0 @@
 
-var http = require('http');
 
-// Instantiate a JTalk object to process requests
 
-var server = smalltalk.TrivialServer._new();
 
-http.createServer(function (req, res) {
 
-  res.writeHead(200, {'Content-Type': 'text/html'});
 
-  // Let the JTalk object process it
 
-  res.end(server._process_(req));
 
-}).listen(1337, "127.0.0.1");
 
-console.log('TrivialServer running at http://127.0.0.1:1337/');

+ 0 - 8
nodejs/trivialserver2/Makefile
View File 

@@ -1,8 +0,0 @@
 
-Program.js: TrivialServer.st
 
-	../jtalkc -N -m TrivialServer TrivialServer.st Program
 
-
 
-run: Program.js
 
-	./trivial
 
-
 
-clean:
 
-	rm Program.js TrivialServer.js

+ 0 - 4
nodejs/trivialserver2/README
View File 

@@ -1,4 +0,0 @@
 
-Slight variation on ../trivialserver but this one tries to do more Node
 
-stuff from Smalltalk. Note that we can use a block as a function callback.
 
-It would be nice if we could improve more on JTalk's ability to call javascript
 
-code directly.

+ 0 - 49
nodejs/trivialserver2/TrivialServer.st
View File 

@@ -1,49 +0,0 @@
 
-Object subclass: #TrivialServer
 
-        instanceVariableNames: 'counter'
 
-        category: 'TrivialServer'!
 
-
 
-!TrivialServer methodsFor: 'initializing'!
 
-initialize
 
-        counter := 0
 
-! !
 
-
 
-!TrivialServer methodsFor: 'processing'!
 
-process: aRequest
 
-        | hostname httpVersion stream |
 
-	counter := counter + 1.
 
-
 
-        "Calling a method in a js module"
 
-	hostname := {'os.hostname()'}.
 
-
 
-        "Accessing a property of js HTTP request object"
 
-        httpVersion := {'aRequest.httpVersion'}.
 
-
 
-        stream := String new writeStream.
 
-	stream
 
-		nextPutAll: '<html><p>Request HTTP version: ', httpVersion, '</p>';
 
-		nextPutAll: '<p>OS hostname: ', hostname, '</p>';
 
-		nextPutAll: '<p>Number of requests: ', counter asString, '</p></html>'.
 
-	^stream contents
 
-!
 
-
 
-start
 
-        | block |
 
-        block := [:req :res |
 
-           {'res.writeHead(200, {''Content-Type'': ''text/html''});'}.
 
-           {'res.end(self._process_(req));'}].
 
-
 
-        {'http.createServer(block).listen(1337, ''127.0.0.1'');'}.
 
-        {'console.log(''TrivialServer running at http://127.0.0.1:1337/'');'}
 
-! !
 
-
 
-
 
-!TrivialServer class methodsFor: 'initialization'!
 
-initialize
 
-        "We require these Node modules."
 
-
 
-	{'os = require(''os''), http = require(''http'');'}
 
-!
 
-
 
-main
 
-	self new start
 
-! !

+ 0 - 1
nodejs/trivialserver2/trivial
View File 

@@ -1 +0,0 @@
 
-node Program.js $@