Skip to content

Commit

Permalink
Merge pull request #33 from mkroehnert/master
Browse files Browse the repository at this point in the history
Update Meta example and Amber submodule for 0.12.0
  • Loading branch information
Manfred Kröhnert committed Oct 30, 2013
2 parents fcfd0c8 + 45cdfb3 commit 7492d84
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
8 changes: 0 additions & 8 deletions nodejs/meta/Makefile

This file was deleted.

10 changes: 5 additions & 5 deletions nodejs/meta/MyScript.st
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ main
creating a class, compiling some methods and then exporting
this package in javascript format to stdout"

| klass method |
| myClass method |

console log: 'Creating new class #Dummy'.

Object subclass: #Dummy instanceVariableNames: '' package: 'Dummy'.
klass := Smalltalk current at: #Dummy.
myClass := Smalltalk current at: #Dummy.

console log: 'Add method #foo to class #Dummy'.
klass compile: 'foo ^10' category: 'foo'.
myClass compile: 'foo ^10' category: 'foo'.

console log: 'Add method #bar to class #Dummy'.
klass compile: 'bar ^ self foo * 2' category: 'foo'.
myClass compile: 'bar ^ self foo * 2' category: 'foo'.

console log: '--- Exported JavaScript for class #Dummy ---'.
console log: (Exporter new exportPackage: 'Dummy').
console log: (String streamContents: [ :str | Exporter new exportPackage: (Smalltalk current packageAt: 'Dummy') on: str ] ).
console log: '--- Exported JavaScript for class #Dummy End---'.
! !

Expand Down
2 changes: 1 addition & 1 deletion vendor/amber
Submodule amber updated 59 files
+68 −0 API-CHANGES.txt
+69 −20 CHANGELOG
+3 −16 Gruntfile.js
+22 −9 bin/amberc
+31 −20 bin/amberc.js
+16 −6 grunt/tasks/grunt-amberc.js
+68 −18 js/Benchfib.js
+47 −25 js/Canvas.js
+162 −48 js/Compiler-AST.js
+43 −27 js/Compiler-Core.js
+8 −4 js/Compiler-Exceptions.js
+782 −280 js/Compiler-IR.js
+419 −169 js/Compiler-Inlining.js
+311 −263 js/Compiler-Interpreter.js
+175 −71 js/Compiler-Semantic.js
+450 −137 js/Compiler-Tests.js
+4 −0 js/Examples.js
+423 −237 js/Helios-Browser.js
+15 −4 js/Helios-Commands-Browser.js
+8 −4 js/Helios-Commands-Core.js
+14 −6 js/Helios-Commands-Tools.js
+526 −226 js/Helios-Core.js
+113 −24 js/Helios-Debugger.js
+29 −12 js/Helios-Inspector.js
+161 −78 js/Helios-KeyBindings.js
+127 −24 js/Helios-Layout.js
+53 −26 js/Helios-References.js
+7 −2 js/Helios-Workspace-Tests.js
+468 −119 js/Helios-Workspace.js
+1,245 −622 js/IDE.js
+509 −141 js/Importer-Exporter.js
+27 −13 js/Kernel-Announcements.js
+259 −126 js/Kernel-Classes.js
+266 −97 js/Kernel-Collections.js
+22 −14 js/Kernel-Exceptions.js
+231 −61 js/Kernel-Infrastructure.js
+96 −42 js/Kernel-Methods.js
+182 −95 js/Kernel-Objects.js
+2,687 −695 js/Kernel-Tests.js
+103 −40 js/SUnit-Tests.js
+36 −13 js/SUnit.js
+37 −13 js/Spaces.js
+22 −5 st/Compiler-AST.st
+51 −14 st/Compiler-IR.st
+46 −56 st/Compiler-Interpreter.st
+1 −1 st/Compiler-Semantic.st
+19 −8 st/Compiler-Tests.st
+11 −0 st/Helios-Browser.st
+2 −4 st/Helios-Core.st
+13 −0 st/Helios-Workspace.st
+14 −14 st/IDE.st
+23 −1 st/Importer-Exporter.st
+42 −6 st/Kernel-Infrastructure.st
+8 −4 st/Kernel-Methods.st
+30 −30 st/Kernel-Objects.st
+166 −1 st/Kernel-Tests.st
+1 −2 support/boot.js
+88 −14 test/Test.js
+1 −1 test/Test.st

0 comments on commit 7492d84

Please sign in to comment.