Changeset 200

Timestamp:

12/26/06 01:44:41 (2 years ago)

Author:

Ant

Message:

catch DMD output to create and show list of error

Files:

• trunk/src/leds/CodeView.d (modified) (1 diff)
• trunk/src/leds/CompilerBox.d (modified) (12 diffs)
• trunk/src/leds/ExecConsole.d (modified) (2 diffs)
• trunk/src/leds/LanguageD.d (modified) (3 diffs)
• trunk/src/leds/Project.d (modified) (22 diffs)
• trunk/src/leds/ProjectError.d (modified) (3 diffs)
• trunk/src/leds/SystemConsole.d (modified) (8 diffs)
• trunk/src/leds/Workspace.d (modified) (16 diffs)

trunk/src/leds/CodeView.d

@@ -2838 +2838 @@
-                }
-                break;
-
+
+
-            case CodeCommand.CLOSE_BUFFER: workspace.closeView(); return true;  break;
-            case CodeCommand.FIND_NEXT: findText(codeEdit.getSelected(),false); break;

trunk/src/leds/CompilerBox.d

@@ -47 +47 @@
-private import gtk.TreeModel;
-private import gtk.TreeIter;
+private import gtk.TreeIterError;
-private import gtk.TreePath;
-private import gtk.TreeViewColumn;
@@ -69 +70 @@
-class CompilerBox : VBox
-{   
-
-
+
-    TreeView compilerMessages;
-    TreeView linkerMessages;
-    ListStore compilerModel;
-    ListStore linkerModel;
-
-    Toolbar toolbar;
@@ -86 +85 @@
-    //Paned panedLinker;
-    
-    Notebook notebook;
-    
-    MetaTupleIF compilerHeader;
-    MetaTupleIF linkerHeader;
-    
-    Workspace workspace;
-
-this(Workspace workspace, MetaTupleIF compilerHeader=null, MetaTupleIF linkerHeader=null)
-{
-   writefln("CompilerBox.this 1");
+Project project;
+
+this(Workspace workspace, Project project, MetaTupleIF compilerHeader=null)
+{
-        super(false, 3);
-        writefln("CompilerBox.this 2");
-        this.workspace = workspace;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    void clearAll()
-    {
-compilerView
+rawTextCommands
-        compilerModel.clear();
-        linkerView.getBuffer().setText("");
-        linkerModel.clear();
-        notebook.setCurrentPage(1);
-        currErrorButton.setSensitive(false);
-        prevErrorButton.setSensitive(false);
-        nextErrorButton.setSensitive(false);
-    }
+    
+    /**
+     * Adds the raw compiler command to the raw input / output commands window
+     * Params:
+     *      compilerCommand =   
+     */
-    void addCompilerCommand(String compilerCommand)
-    {
-
-
-
+
+
+
+
+
+
+
+
-    void addLinkerCommand(String linkerCommand)
-    {
-
-
-
+
+
+
+
+
+
+
+
-    void addCompilerError(ProjectError error)
-    {
+        
-        currErrorButton.setSensitive(true);
-        prevErrorButton.setSensitive(true);
@@ -156 +173 @@
-    }
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        if ( compilerHeader is null )
@@ -162 +199 @@
-            compilerHeader = getDMDCompilerHeader();
-        }
-        if ( linkerHeader is null )
-        {
-            linkerHeader = getGCCLinkerHeader();
-        }
-
-        this.compilerHeader = compilerHeader;
-        this.linkerHeader = linkerHeader;
-        
-        compilerModel = createModel(compilerHeader);
-
-
-
-
+
+
-        
-        compilerMessages = createTreeView(compilerHeader, compilerModel);
@@ -180 +210 @@
-        compilerMessages.addOnButtonRelease(&mouseButtonReleaseCallback);
-
-        linkerMessages = createTreeView(linkerHeader, linkerModel);
-        
-        writefln("CompilerBox.setup 1");
-        removeAll();
-        writefln("CompilerBox.setup 1.1");
-        
-        toolbar = setupToolbar();
-        writefln("CompilerBox.setup 1.2");
-        
-        packStart(toolbar, false, false, 0);
-
-
-
-
-
-
-
-
-
-
-
+
-        ScrolledWindow scm = new ScrolledWindow();
-        scm.setPolicy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
-        scm.add(compilerMessages);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    Toolbar setupToolbar()
-    {
@@ -241 +242 @@
-        }
-            
-        //addButton(Stock.QUIT,"Close", &quit);
-        
-        currErrorButton = cast(Button)toolbar.insertButton(StockID.JUMP_TO,"Current Error","",-1);
-        currErrorButton.addOnClicked(&gotoCurrError);
@@ -259 +258 @@
-        }
-            
-
-
-
-
+
-        
-        return toolbar;
-        
-    }
-    
-    void quit(Button button)
-    {
-    }
-    
@@ -303 +295 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    CompilerBox setCompileCommand(String compileCommand)
-    {
@@ -337 +317 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    TreeView createTreeView(MetaTupleIF header, TreeModel model)
-    {
@@ -371 +342 @@
-    }
-    
+    /**
+     * Creates the model for the errors list
+     * Params:
+     *      header =    
+     * Returns: 
+     *      ListStore
+     */
-    ListStore createModel(MetaTupleIF header)
-    {
@@ -396 +374 @@
-    }
-
+    /**
+     * Opens the source code that generated the error
+     * Params:
+     *      iter =  
+     */
-    void gotoSourceCode(TreeIter iter)
-    {
-        if ( iter !is null )
-        {
-
-
-
+
-            {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
+
-            {
-
-
-
-
-
-
-
-
-
-
-
+
-            }
-        }

trunk/src/leds/ExecConsole.d

@@ -60 +60 @@
-//  }
-    
-    Widget getWidget()
-    {
-        return this;
-    }
-    
-    Menu getTabMenu()
-    {
@@ -82 +77 @@
-     * detrimines if a close button shoud be visible
-     */
-it
+ool
-    {
-        return false;
-    }
-
-
-
-
-
-
-
+
-    {
-        if ( executing )

trunk/src/leds/LanguageD.d

@@ -642 +642 @@
-            " enum double dchar short int long ifloat idouble ireal float"
-        //);
-end(SCI_SETKEYWORDS, 1, cast(sptr_t)
+cintilla.send(SCI_SETKEYWORDS, 1, cast(sptr_t)cast
-            " typedef abstract auto deprecated final struct interface class synchronized"
-
+ template mixin
-        //);
-end(SCI_SETKEYWORDS, DLexTypes.ERROR, cast(sptr_t)
+cintilla.send(SCI_SETKEYWORDS, SCE_C_WORD2/*scintilla.DLexTypes.ERROR*/, cast(sptr_t)cast
-            " throw try assert catch finally true false null"
-        //);
-
+cintilla.s
-            " const alias module export import extern debug align asm version"
-        //);
-
+cintilla.s
-            " body break continue case default do else if switch for foreach return goto while with"
-        //);
-
+cintilla.s
-            " delegate function  this super new delete override "
-        );
@@ -664 +664 @@
-    }
-
-
+ 
-    {
-        //SCE_C_DEFAULT=0;
@@ -729 +729 @@
-        //printf("setDLex 4\n");
-
+        
+        //scintilla.send(SCI_STYLESETFORE, 1 , 0x800000);
+        
-        //printf("setDLex 5\n");
-        //send(SCI_STYLESETFORE, DLexTypes.TYPES , 0x800000);

trunk/src/leds/Project.d

@@ -38 +38 @@
-private import leds.Leds;
-private import leds.Workspace;
-Exec
+Build
-private import leds.Docker;
-private import leds.SystemConsole;
@@ -238 +238 @@
-    public void addCompileErrors(String moduleName)
-    {
-
+.dup
-        if ( compileErrors.length == 1 )
-        {
@@ -567 +567 @@
-        ProjectTarget target;
-        
-ExecConsole exec
+BuildConsole build
-        CompilerBox compilerBox;
-        
@@ -576 +576 @@
-            target.setNativeTargetPlatform();
-            
-
+
+
-                new String("build ")~target.getTarget(),
-                &mouseReleaseOnConsole
-                );
-exec
+build
-            Path.chdir(project.getBaseDir());
-
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
-        }
-
@@ -626 +627 @@
-            gdkThreadsEnter();
-            
-            writefln("TargetBuilder.compOutputReader 1 >>>%s<<<", inLine);
-            String line = new String(inLine);
-            if( line.strip().length > 0 )
@@ -634 +634 @@
-                projectError = new ProjectError(
-                    project, 
-
+.dup
-                    lineNumber, 
-                    line, 
-                    ProjErrorType.ERROR);
-
-
-
-
+//
+//
+//
+//
-                if ( lineNumber > 0 )
-                {
-                    if ( modulePath.length>0 )
-                    {
-
+
+
+
+
+
-                    }
-                }
@@ -659 +663 @@
-        {
-            gdkThreadsEnter();
-            
-            writefln("TargetBuilder.compErrorReader 1 >>>%s<<<", line);
-            
-            Gdk.flush();
@@ -730 +732 @@
-        private void setupCompiler(ProjectTarget target)
-        {
-            writefln("Project.TragerBuilder_compd compiling with compd");
-            compiler = new Compiler();
-            char[] baseSrc = target.getBaseDir.toString();
@@ -785 +786 @@
-        public bool execute(char[] compilerCommand, void delegate(int) executionEnded)
-        {
-
-
-
-
-
-
+
+
+
+
+
-                project.getBaseDir(), 
-                new String(compilerCommand),
@@ -803 +803 @@
-                executionEnded(execStatus);
-            }
-exec
-exec
+build
+build
-        }
-        
@@ -868 +868 @@
-                String compCom = target.getCompilerCommand();
-    
-exec
+build
-                    target.getBaseDirSrc(), 
-                    compCom,
@@ -888 +888 @@
-        bool linkTarget(Spawn spawn)
-        {
-            writefln("Project.linkTarget entry");
-            gdkThreadsEnter();
-            
@@ -894 +893 @@
-            {
-                String linkCom = target.getLinkCommand();
-
-
-
-
+//
+//
+//
+//
-                Path.chdir(project.getBaseDir());
-exec
+build
-                    true,
-                    &endLink,
@@ -905 +904 @@
-                    &linkErrorReader
-                    );
-exec
+build
-            }
-            //if ( lastP_OpenExitStatus != 0 )
-            {
-exec
+build
-                project.workspace.getProjectView().setProjectStatus(project);
-            }
@@ -949 +948 @@
-        ProjectError projectError;
-        CompilerBox compilerBox;
-
-
-
-
+//
+//
+//
+//
-        foreach ( String line ; grabOutput.splitLines() )
-        {
@@ -961 +960 @@
-                projectError = new ProjectError(
-                    this, 
-
+.dup
-                    lineNumber, 
-                    line, 
-                    ProjErrorType.ERROR);
-
-
-
-
+//
+//
+//
+//
-                if ( lineNumber > 0 )
-                {
@@ -1002 +1001 @@
-            if ( target.exec )
-            {
-                
-                writefln("Project.getRunMenu %s %s ", target.getTarget(), target.getRunParameters());
-                
-                popupMenu.append(
-                    new MenuItem(
@@ -1033 +1029 @@
-        if ( target !is null )
-        {
-true
+Leds.leds.getPropValue("newOnRun", false)
-        }
-    }
@@ -1196 +1192 @@
-    public void build(bit newConsole)
-    {
+        
+        writefln("- Project.build");
-        //if ( getCurrTarget(props.get("lastTarget","")) !is null )
-        //{
@@ -1223 +1221 @@
-                int exitStatus;
-                //workspace.getErrorPane().drawNow();
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
-                if ( newConsole )
-                {
-ExecConsole execConsole = new ExecConsole(workspace,
-exec
-exec
+BuildConsole buildConsole = new BuildConsole(workspace,this, 
+build
+build
-                        getBaseDir(),
-                        buildCommand
@@ -1355 +1353 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        ProjectError[] moduleErrors;
-        String fileName = projectError.getFileName();
@@ -1370 +1411 @@
-            projectErrors[fileName] = moduleErrors;
-        }
+        return true;
-    }
-    

trunk/src/leds/ProjectError.d

@@ -21 +21 @@
-private import dool.String;
-private import leds.Project;
-
+
+
+
-public enum ProjErrorType
-{
@@ -44 +46 @@
-    {
-        this.project = project;
-
+.dup
-        this.lineNumber = lineNumber;
-        this.message = message;
@@ -62 +64 @@
-    public String getFileName()
-    {
-
+.dup
-    }
-    

trunk/src/leds/SystemConsole.d

@@ -72 +72 @@
-
-    void delegate(String)[] mouseActionButtonListeners;
+    
-
-    /**
@@ -80 +81 @@
-    {
-        this.workspace = workspace;
+        setPolicy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
-        tabName = new String("output");
-
+
+
+
+
+
+
-        textView = new TextView();
-00000
+F0F0F
-        setFont();
-        add(textView);
-        //textView.addOnButtonPress(&onMouseButtonPress);
-        textView.addOnButtonRelease(&onMouseButtonRelease);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    int onMouseButtonPress(GdkEventButton* event, Widget widget)
-    {
-textView.getLineTextAt(cast(int)event.y
+getSelectedLine(event
-        if ( event.button == 1 && Event.isDoubleClick(event, 1) )
-        {
@@ -105 +121 @@
-    int onMouseButtonRelease(GdkEventButton* event, Widget widget)
-    {
-textView.getLineTextAt(cast(int)event.y
+getSelectedLine(event
-        if ( event.button == 2 )
-        {
@@ -132 +148 @@
-            workspace.refreshDockableLabel(this);
-        }
-    }
-    
-    String getLineTextAt(int y)
-    {
-        return new String(textView.getLineTextAt(y));
-    }
-    
@@ -278 +289 @@
-    {
-        //writefln("%s", text);
-
+
+
+
+
-    }
-    
@@ -286 +300 @@
-    }
-
+    public void appendCommand(String command)
+    {
+        append(command);
+    }
+    
-//  public int exec(String workDir, String command, bit async = false)
-//  {
@@ -343 +362 @@
-        Path.chdir(workDir);
-        command = expandCommand(command);
-
+Command
-        char[][] commArgs;
-        foreach ( String str ; command.split())
@@ -503 +522 @@
-    }
-
-;
+

trunk/src/leds/Workspace.d

@@ -37 +37 @@
-private import leds.SystemConsole;
-private import leds.ExecConsole;
+private import leds.BuildConsole;
-private import leds.Docker;
-private import leds.DockerFiles;
@@ -719 +720 @@
-            findTextCombo = new ComboBoxEntry();
-            findTextCombo.maxCount = 16;
-
+
+
-        }
-        ToolItem toolItem = new ToolItem();
@@ -764 +766 @@
-            if ( fileName != "" )
-            {
-                writefln("Workspace.MakeNow 1");
-                ExecConsole execConsole = new ExecConsole(this,"dmd "~fileName.toString());
-                writefln("Workspace.MakeNow 2");
-                addConsole(execConsole);
-                writefln("Workspace.MakeNow 3");
-                execConsole.exec(Path.getcwd(),fileName.dup.prepend("dmd ")~" -I~/dmd/src/phobos");
-                writefln("Workspace.MakeNow 4");
-            }
-        }
@@ -844 +842 @@
-    public int makeSelectTarget(GdkEventButton*  event, Widget widget)
-    {
-        writefln("Workspace.makeSelectTarget 1");
-        Project project = getProjectView().getCurrentProject();
-        writefln("Workspace.makeSelectTarget 2");
-        switch ( event.button )
-        {
-            case 1:
-        writefln("Workspace.makeSelectTarget 3");
-                //project.build(true);
-                makeNow(project);
@@ -856 +851 @@
-            
-            case 3:
-        writefln("Workspace.makeSelectTarget 4");
-                //if ( project  !is  null )
-                {