Changeset 36072

Timestamp:

12/05/09 20:07:13 (4 years ago)

Author:

hoge1e3

Message:

 

Location:

lang/haxe/Tonyu2

Files:

• Project.hx (modified) (2 diffs)
• Projects/toste/Test.tonyu (modified) (2 diffs)
• Projects/toste/haxe/Test.hx (modified) (2 diffs)
• Projects/toste/toste.swf (modified) (previous)
• htdocs/Project.class.js (modified) (6 diffs)
• htdocs/index.html (modified) (1 diff)
• htdocs/shortcut.js (added)
• ide.n (deleted)
• ide/HaxeC.hx (modified) (3 diffs)
• ide/ProjectProcessor.hx (modified) (1 diff)

lang/haxe/Tonyu2/Project.hx

@@ -65 +65 @@
         public var haxeDir(getHaxeDir,null):String ;
         public function getHaxeDir():String{ return home+"\\haxe";}
-        public function haxe2swf() {
+        public function haxe2swf():String {
                 var c=new ide.HaxeC(haxeDir, name);
-                c.compile();
+                return c.compile();
                 /*
                 neko.Sys.setCwd(haxeDir);           
@@ -81 +81 @@
                 neko.Sys.setCwd(home);    */
         }
-        public function make() {
+        public function make():String {
                 tonyu2haxe();
-                haxe2swf();
+                var res=haxe2swf();
+                return res;
         }
         public function new (home:String, name:String){

lang/haxe/Tonyu2/Projects/toste/Test.tonyu

@@ -2 +2 @@
 
 x=0;
+y=200;
 while (x<200) {
   x=x+1;
@@ -8 +9 @@
   update();
 }
+while (y>0) {
+  y=y-rnd(6);y=y+2;
+  update();  
+}

lang/haxe/Tonyu2/Projects/toste/haxe/Test.hx

@@ -5 +5 @@
       case 0:
         x=0;
+        y=200;
         state=1;
       case 1:
@@ -21 +22 @@
         state=1;
       case 3:
+        state=5;
+      case 5:
+        if ((y>0)) {
+          state=6;
+        } else {
+          state=7;
+        }
+      case 6:
+        y=(y-rnd(6));
+        y=(y+2);
+        state=8;
+        return;
+      case 8:
+        state=5;
+      case 7:
         terminateProc();
         return;

lang/haxe/Tonyu2/htdocs/Project.class.js

@@ -1 +1 @@
 function procAjax(p) {
+        if (p==null) return function(){};
    return function (res) {
      try {
@@ -12 +13 @@
         return ["div",{style:pos(x,y)},cont];
 }
+var curProject;
+shortcut.add("Ctrl+W",function(){curProject.saveTonyuSource()});
+shortcut.add("F9",function(){curProject.makeRun()});
 //alert("P");
+
+function dButton(onClick,caption) {
+        var b;
+        return b=tag("button",{onclick:function () {
+                b.target.disabled=true;
+                onClick(function () {b.target.disabled=false;});
+        }},caption);
+}
+
 Project =Class.create({
         initialize: function (name) {
@@ -21 +34 @@
         open: function () {
                 var t=this;
+                curProject=t;
                 t.editor=tag("textarea",{rows:15 , cols:80});
                 t.fileList=tag("div",{style:pos(420,10)});
                 t.swfArea=tag("div",{style:pos(10,10)});
-                $tag("body").set([["div", "プロジェクト", t.name],
+                t.modifiedIndicator=tag("span");
+                t.compileResult=tag("textarea",{rows:5 , cols:80});
+                document.title=t.name +" - Tonyu System";
+                $tag("body").set([
                    t.swfArea,
                    t.fileList, 
                    posDiv(500,10,[
                         t.editor,
-                    ["button",{onclick:function(){t.saveTonyuSource()}},"SAVE"],
-                    ["button",{onclick:function(){t.run()}},"Run"],
-                        ["button",{onclick:function(){t.makeRun()}},"Make&Run"]
+                    dButton(function(e){t.saveTonyuSource(e)},"SAVE(Ctrl+W)"),
+                    dButton(function(e){t.run(e)},"Run"),
+                        dButton(function(e){t.makeRun(e)},"Make&Run(F9)"),
+                        t.modifiedIndicator,["br"],
+                        t.compileResult
                    ])
                 ]);
                 attachIndentAdaptor(t.editor.target);
+                setInterval(function (){
+                        t.updateModifiedIndicator();
+                }, 50);
                 t.listTonyuSource();
         },
@@ -68 +90 @@
                         t.editor.setAttr("value",res);
                         t.currentSourceName=name;
+                        t.savedCont=res;
                 }
         },
-        saveTonyuSourceAs: function (cl,cont) {
+        updateModifiedIndicator: function () {
+                var t=this;
+                t.modifiedIndicator.set(t.editorContentModified() ? "*" : "");
+        },
+        editorContentModified: function () {
+                var t=this;
+                return t.savedCont!=t.editor.getAttr("value");
+        },
+        saveTonyuSourceAs: function (cl,cont,next) {
                 var t=this;     
                 new Ajax.Request(
@@ -77 +108 @@
                                 method: 'POST', 
                                 parameters: {content: cont}, 
-                                onComplete: procAjax(showResponse)
+                                onComplete: procAjax(next2)
                         });
-                function showResponse(res) {
-                        alert(res);
+                function next2(res) {
+                        if (res=="OK") {
+                                t.savedCont=cont;
+                                t.updateModifiedIndicator();
+                                if (next!=null) next();
+                        }
                 }
         },
-        saveTonyuSource: function () {
+        saveTonyuSource: function (next) {
                 var t=this;     
                 //alert(t.currentSourceName);
                 if (t.currentSourceName == null) return;
-                t.saveTonyuSourceAs( t.currentSourceName, t.editor.getAttr("value") );
+                t.saveTonyuSourceAs( t.currentSourceName, t.editor.getAttr("value"),next );
         },
-        make: function (afterMake) {
+        make: function (next) {
                 var t=this;     
+                t.swfArea.set("Compiling...");
                 new Ajax.Request(
                         t.homeURL+"/make" , 
@@ -96 +132 @@
                                 method: 'GET', 
                                 parameters: {}, 
-                                onComplete: procAjax(showResponse)
+                                onComplete: procAjax(next2)
                         });
-                function showResponse(res) {
-                        //alert(res);
-                        afterMake(res);
+                function next2(res) {
+                        t.compileResult.setAttr("value",res);
+                        if (next) next(res);
                 }
         },
-        makeRun: function () {
+        makeRun: function (next) {
                 var t=this;
-                t.make(function(res) {
-                    t.swfArea.set(res);
-                        setTimeout(function(){t.run();},10);
-                });
+                if (t.editorContentModified()) {
+                        t.saveTonyuSource(domake);
+                } else {domake();}
+                function domake() {
+                        t.make(function(res) {
+                                if (res.length<5) {      
+                                        t.swfArea.set(res);
+                                        t.run(next);
+                                } else {
+                                        if (next) next();
+                                }
+                                //setTimeout(function(){t.run();},10);
+                        });
+                }
         },
-        run: function () {
+        run: function (next) {
            var t=this;
                 t.swfArea.set(swf(t.homeURL+"/swf"));
+                if (next) next();
         }
 });

lang/haxe/Tonyu2/htdocs/index.html

@@ -5 +5 @@
         <body id="body" onload="boot()">Please wait...</body>
                 <script src="htdocs/prototype.js"></script>
+                <script src="htdocs/shortcut.js"></script>
                 <script src="htdocs/indent.js"></script>
                 <script src="htdocs/TagBuilder.class.js"></script>

lang/haxe/Tonyu2/ide/HaxeC.hx

@@ -8 +8 @@
                 this.swfName=swfName;
         }
-        public function compile() {
+        public function compile():String {
                 var home=neko.Sys.getCwd();
                 neko.Sys.setCwd(dir);       
@@ -27 +27 @@
                 trace(haxePath+" "+args);
                 var p=new neko.io.Process(haxePath,args);
+                var stderr="";
                 while (true) {
                         try {
                                 var s=p.stderr.readLine();
+                                stderr+=s;
                                 trace(s);
                         } catch (e:haxe.io.Eof) {break;}
@@ -35 +37 @@
                 p.close();
                 trace("setCWD "+home);
-                neko.Sys.setCwd(home);    
+                neko.Sys.setCwd(home);  
+                        return stderr;
         }
         static public function init() {

lang/haxe/Tonyu2/ide/ProjectProcessor.hx

@@ -40 +40 @@
         }
         function make() {
-                project.make();
-                res.content="Build end";
+                var makeR=project.make();
+                res.content=makeR; //"Build end";
         }       
         function tonyuSrc() {