소스 검색

Move to <inlineJS: '...'>.

Herbert Vojčík 7 년 전
부모
커밋
21198871c2
4개의 변경된 파일25개의 추가작업 그리고 25개의 파일을 삭제
  1. 2 2
      src/Benchfib.js
  2. 4 4
      src/Benchfib.st
  3. 9 9
      src/IDE.js
  4. 10 10
      src/IDE.st

+ 2 - 2
src/Benchfib.js

@@ -190,7 +190,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "jsbenchFib\x0a\x0a\x09<if (this < 2) {\x0areturn 1;\x0a} else {\x0areturn (this-1)._jsbenchFib() + (this-2)._jsbenchFib() + 1;}>",
+source: "jsbenchFib\x0a\x0a\x09<inlineJS: 'if (this < 2) {\x0areturn 1;\x0a} else {\x0areturn (this-1)._jsbenchFib() + (this-2)._jsbenchFib() + 1;}'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
@@ -235,7 +235,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "jsbenchmark\x0a\x0a<\x0avar size = 8190;\x0avar count;\x0afor (var z=0;z<this;z++) {\x0a\x09count = 0;\x0a\x09var flags = new Array();\x0a\x09for (var p=0; p<size; p++) {\x0a\x09flags[p] = true;\x0a\x09}\x0a\x09for (var i=1;i<=size;i++) {\x0a\x09\x09if (flags[i-1]) {\x0a\x09\x09\x09var prime = i+1;\x0a\x09\x09\x09var k = i + prime;\x0a\x09\x09\x09while (k <= size) {\x0a\x09\x09\x09\x09flags[k-1] = false;\x0a\x09\x09\x09\x09k = k + prime;\x0a\x09\x09\x09}\x0a\x09\x09\x09count = count + 1;\x0a\x09\x09}\x0a\x09}\x0a}\x0areturn count>",
+source: "jsbenchmark\x0a\x0a<inlineJS: '\x0avar size = 8190;\x0avar count;\x0afor (var z=0;z<this;z++) {\x0a\x09count = 0;\x0a\x09var flags = new Array();\x0a\x09for (var p=0; p<size; p++) {\x0a\x09flags[p] = true;\x0a\x09}\x0a\x09for (var i=1;i<=size;i++) {\x0a\x09\x09if (flags[i-1]) {\x0a\x09\x09\x09var prime = i+1;\x0a\x09\x09\x09var k = i + prime;\x0a\x09\x09\x09while (k <= size) {\x0a\x09\x09\x09\x09flags[k-1] = false;\x0a\x09\x09\x09\x09k = k + prime;\x0a\x09\x09\x09}\x0a\x09\x09\x09count = count + 1;\x0a\x09\x09}\x0a\x09}\x0a}\x0areturn count'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []

+ 4 - 4
src/Benchfib.st

@@ -51,15 +51,15 @@ benchmark
 
 jsbenchFib
 
-	<if (this < 2) {
+	<inlineJS: 'if (this < 2) {
 return 1;
 } else {
-return (this-1)._jsbenchFib() + (this-2)._jsbenchFib() + 1;}>
+return (this-1)._jsbenchFib() + (this-2)._jsbenchFib() + 1;}'>
 !
 
 jsbenchmark
 
-<
+<inlineJS: '
 var size = 8190;
 var count;
 for (var z=0;z<this;z++) {
@@ -80,7 +80,7 @@ for (var z=0;z<this;z++) {
 		}
 	}
 }
-return count>
+return count'>
 !
 
 jstinyBenchmarks

+ 9 - 9
src/IDE.js

@@ -938,7 +938,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anEvent"],
-source: "handleKeyDown: anEvent\x0a\x09<if(anEvent.ctrlKey) {\x0a\x09\x09if(anEvent.keyCode === 80) { //ctrl+p\x0a\x09\x09\x09self._printIt();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09\x09if(anEvent.keyCode === 68) { //ctrl+d\x0a\x09\x09\x09self._doIt();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09\x09if(anEvent.keyCode === 73) { //ctrl+i\x0a\x09\x09\x09self._inspectIt();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09}>",
+source: "handleKeyDown: anEvent\x0a\x09<inlineJS: 'if(anEvent.ctrlKey) {\x0a\x09\x09if(anEvent.keyCode === 80) { //ctrl+p\x0a\x09\x09\x09self._printIt();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09\x09if(anEvent.keyCode === 68) { //ctrl+d\x0a\x09\x09\x09self._doIt();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09\x09if(anEvent.keyCode === 73) { //ctrl+i\x0a\x09\x09\x09self._inspectIt();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09}'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
@@ -1300,11 +1300,11 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self['@editor'] = self._class()._codeMirror().fromTextArea(aTextarea, {
-		theme: 'ide.codeMirrorTheme'._settingValueIfAbsent_('default'),
-		mode: 'text/x-stsrc',
+self["@editor"] = self._class()._codeMirror().fromTextArea(aTextarea, {
+		theme: "ide.codeMirrorTheme"._settingValueIfAbsent_("default"),
+		mode: "text/x-stsrc",
 		lineNumbers: true,
-		enterMode: 'flat',
+		enterMode: "flat",
 		indentWithTabs: true,
 		indentUnit: 4,
 		matchBrackets: true,
@@ -1317,7 +1317,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aTextarea"],
-source: "setEditorOn: aTextarea\x0a\x09<self['@editor'] = self._class()._codeMirror().fromTextArea(aTextarea, {\x0a\x09\x09theme: 'ide.codeMirrorTheme'._settingValueIfAbsent_('default'),\x0a\x09\x09mode: 'text/x-stsrc',\x0a\x09\x09lineNumbers: true,\x0a\x09\x09enterMode: 'flat',\x0a\x09\x09indentWithTabs: true,\x0a\x09\x09indentUnit: 4,\x0a\x09\x09matchBrackets: true,\x0a\x09\x09electricChars: false\x0a\x09})>",
+source: "setEditorOn: aTextarea\x0a\x09<inlineJS: 'self[\x22@editor\x22] = self._class()._codeMirror().fromTextArea(aTextarea, {\x0a\x09\x09theme: \x22ide.codeMirrorTheme\x22._settingValueIfAbsent_(\x22default\x22),\x0a\x09\x09mode: \x22text/x-stsrc\x22,\x0a\x09\x09lineNumbers: true,\x0a\x09\x09enterMode: \x22flat\x22,\x0a\x09\x09indentWithTabs: true,\x0a\x09\x09indentUnit: 4,\x0a\x09\x09matchBrackets: true,\x0a\x09\x09electricChars: false\x0a\x09})'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
@@ -1436,7 +1436,7 @@ var self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
- self._codeMirror().keyMap["default"].fallthrough = ["basic"] ;
+self._codeMirror().keyMap["default"].fallthrough = ["basic"];
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setupCodeMirror",{},$globals.SourceArea.klass)});
@@ -1444,7 +1444,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "setupCodeMirror\x0a\x09< self._codeMirror().keyMap[\x22default\x22].fallthrough = [\x22basic\x22] >",
+source: "setupCodeMirror\x0a\x09<inlineJS: 'self._codeMirror().keyMap[\x22default\x22].fallthrough = [\x22basic\x22]'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []
@@ -3478,7 +3478,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["anEvent"],
-source: "handleSourceAreaKeyDown: anEvent\x0a\x09<if(anEvent.ctrlKey) {\x0a\x09\x09if(anEvent.keyCode === 83) { //ctrl+s\x0a\x09\x09\x09self._compile();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09}\x0a\x09>",
+source: "handleSourceAreaKeyDown: anEvent\x0a\x09<inlineJS: 'if(anEvent.ctrlKey) {\x0a\x09\x09if(anEvent.keyCode === 83) { //ctrl+s\x0a\x09\x09\x09self._compile();\x0a\x09\x09\x09anEvent.preventDefault();\x0a\x09\x09\x09return false;\x0a\x09\x09}\x0a\x09}\x0a\x09'>",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: []

+ 10 - 10
src/IDE.st

@@ -210,16 +210,16 @@ selection
 !
 
 setEditorOn: aTextarea
-	<self['@editor'] = self._class()._codeMirror().fromTextArea(aTextarea, {
-		theme: 'ide.codeMirrorTheme'._settingValueIfAbsent_('default'),
-		mode: 'text/x-stsrc',
+	<inlineJS: 'self["@editor"] = self._class()._codeMirror().fromTextArea(aTextarea, {
+		theme: "ide.codeMirrorTheme"._settingValueIfAbsent_("default"),
+		mode: "text/x-stsrc",
 		lineNumbers: true,
-		enterMode: 'flat',
+		enterMode: "flat",
 		indentWithTabs: true,
 		indentUnit: 4,
 		matchBrackets: true,
 		electricChars: false
-	})>
+	})'>
 !
 
 val
@@ -260,7 +260,7 @@ focus
 !
 
 handleKeyDown: anEvent
-	<if(anEvent.ctrlKey) {
+	<inlineJS: 'if(anEvent.ctrlKey) {
 		if(anEvent.keyCode === 80) { //ctrl+p
 			self._printIt();
 			anEvent.preventDefault();
@@ -276,7 +276,7 @@ handleKeyDown: anEvent
 			anEvent.preventDefault();
 			return false;
 		}
-	}>
+	}'>
 !
 
 inspectIt
@@ -342,7 +342,7 @@ initialize
 !
 
 setupCodeMirror
-	< self._codeMirror().keyMap["default"].fallthrough = ["basic"] >
+	<inlineJS: 'self._codeMirror().keyMap["default"].fallthrough = ["basic"]'>
 ! !
 
 Widget subclass: #TabManager
@@ -862,14 +862,14 @@ disableSaveButton
 !
 
 handleSourceAreaKeyDown: anEvent
-	<if(anEvent.ctrlKey) {
+	<inlineJS: 'if(anEvent.ctrlKey) {
 		if(anEvent.keyCode === 83) { //ctrl+s
 			self._compile();
 			anEvent.preventDefault();
 			return false;
 		}
 	}
-	>
+	'>
 !
 
 hideClassButtons