Changeset 278

Timestamp:

07/17/10 22:35:53 (2 years ago)

Author:

Kuan Hsu

Message:

1. Add EOL Options
2. Fixed "Update Parser Live Full" Bugs....
3. Fixed Parser( nested extern(?)....)

Files:

• trunk/current/poseidon/CodeAnalyzer/syntax/attributes.d (modified) (1 diff)
• trunk/current/poseidon/CodeAnalyzer/syntax/nodeHsu.d (modified) (1 diff)
• trunk/current/poseidon/CodeAnalyzer/syntax/statements.d (modified) (1 diff)
• trunk/current/poseidon/images/linux.gif (added)
• trunk/current/poseidon/images/mac.gif (added)
• trunk/current/poseidon/images/windows.gif (added)
• trunk/current/poseidon/nls/english.ini (modified) (2 diffs)
• trunk/current/poseidon/poseidon.exe (modified) (previous)
• trunk/current/poseidon/poseidon/controller/actionmanager.d (modified) (2 diffs)
• trunk/current/poseidon/poseidon/controller/dialog/aboutbox.d (modified) (1 diff)
• trunk/current/poseidon/poseidon/controller/editor.d (modified) (2 diffs)
• trunk/current/poseidon/poseidon/controller/menumanager.d (modified) (4 diffs)
• trunk/current/poseidon/poseidon/controller/outline.d (modified) (5 diffs)
• trunk/current/poseidon/poseidon/controller/toolbarmanager.d (modified) (1 diff)
• trunk/current/poseidon/poseidon/globals.d (modified) (1 diff)
• trunk/current/poseidon/poseidon/style/dstyle.d (modified) (6 diffs)

trunk/current/poseidon/CodeAnalyzer/syntax/attributes.d

@@ -181 +181 @@
-            case TOK.Tauto:
-                globalProt = globalProt & ( D_Attribute - D_Storage ) | D_Auto;
+                return true;
+
+            case TOK.Textern:
+                globalProt = globalProt & ( D_Attribute - D_Storage ) | D_Extern;
-                return true;
-

trunk/current/poseidon/CodeAnalyzer/syntax/nodeHsu.d

@@ -320 +320 @@
-
-    void passChildren( CAnalyzerTreeNode[] leafs ){ children = leafs; }
+
+    void increaseLineNumber( int startNum, int adds )
+    {
+        void _processChildren( CAnalyzerTreeNode node )
+        {
+            foreach( CAnalyzerTreeNode t; node.children )
+            {
+                if( t.lineNumber >= startNum ) t.lineNumber += adds;
+                if( t.getLeafCount > 0 ) _processChildren( t );
+            }
+        }
+
+        if( this.lineNumber >= startNum ) this.lineNumber += adds;
+        _processChildren( this );
+    }
-
-    /*

trunk/current/poseidon/CodeAnalyzer/syntax/statements.d

@@ -1264 +1264 @@
-                handle[TOK.Tinvariant] = &handleStorageClass;
-                handle[TOK.Timmutable] = &handleStorageClass;
+
+        assign!(AttributeDeclaration).toParse(TOK.Textern);
+                //handle[TOK.Textern] = &handleStorageClass; // D 2.0
-    }
-

trunk/current/poseidon/nls/english.ini

@@ -76 +76 @@
-view.class = &Class Browser
-view.debug = &Debug
+view.eol = &End Of Line Symbol
+view.space = &Space And Tab Symbol
-
-; project menu
@@ -103 +105 @@
-tools.language = Language
-tools.encode = &Encode
+tools.seteol = &Set EOL Character
+tools.eol = &Convert EOL Character
-tools.associate = File &Associate
-tools.options = &Options...

trunk/current/poseidon/poseidon/controller/actionmanager.d

@@ -1254 +1254 @@
-    }
-
-    public void actionEOL(Event e)
-    {
-        MenuItem mi = cast(MenuItem)e.widget;
-        EditItem ei = sGUI.editor.getSelectedEditItemHSU();
-
-        if( ei !is null )
-        {
-            char[] text = mi.getText();
-            int mode = ei.scintilla.getEOLMode();
-
-            switch( text )
-            {
-                case "Windows":
-                    if( mode == 0 )
-                        return;
-                    else
-                    {
-                        ei.scintilla.convertEOLs( 0 );
-                    }
-                    break;
-
-                case "Unix":
-                    if( mode == 2 )
-                        return;
-                    else
-                        ei.scintilla.convertEOLs( 2 );
-
-                case "Macintosh":
-                    if( mode == 1 )
-                        return;
-                    else
-                    {
-                        ei.scintilla.convertEOLs( 1 );
-                    }
-
-                default:
-            }
-        }
-    }   
-    
-    public void actionPreference(Event e)
-    {
@@ -1299 +1259 @@
-        prf.open();
-    }
+    
-    public void actionAboutBox(Event e)
-    {

trunk/current/poseidon/poseidon/controller/dialog/aboutbox.d

@@ -38 +38 @@
-        with(label = new CLabel(top, DWT.CENTER)){
-            //setText("Poseidon Editor for D v " ~ Globals.getVersionS());
-7
+8
-            setForeground(color);
-        }

trunk/current/poseidon/poseidon/controller/editor.d

@@ -725 +725 @@
-            e.doit = false;
-
-sGUI.editor.items.length == 0 ) 
+!sGUI.editor.items.length )    
-
-        /*
@@ -739 +739 @@
-        EditItem ei = cast(EditItem) e.item;
-        ei.reportErrors();
+
+        if( sGUI.menuMan.showEOLItem.getSelection() && !ei.scintilla.getViewEOL() )
+            ei.scintilla.setViewEOL( true );
+        else if( !sGUI.menuMan.showEOLItem.getSelection() && ei.scintilla.getViewEOL() )
+            ei.scintilla.setViewEOL( false );
+
+        if( sGUI.menuMan.showSpaceItem.getSelection() && !ei.scintilla.getViewWS() )
+            ei.scintilla.setViewWS( 1 );
+        else if( !sGUI.menuMan.showSpaceItem.getSelection() && ei.scintilla.getViewWS() )
+            ei.scintilla.setViewWS( 0 );
+
+        if( sGUI.menuMan.setEOLMenuItem[0].getSelection )
+            ei.scintilla.setEOLMode( 0 );
+        else if( sGUI.menuMan.setEOLMenuItem[1].getSelection )
+            ei.scintilla.setEOLMode( 1 );
+        else if( sGUI.menuMan.setEOLMenuItem[2].getSelection )
+            ei.scintilla.setEOLMode( 2 );
+            
-        /*
-        sAutoComplete.setFileParser( sAutoComplete.getParserFromProjectParser( ei.getFileName() ) );

trunk/current/poseidon/poseidon/controller/menumanager.d

@@ -26 +26 @@
-                        undoItem, redoItem, cutItem, copyItem, pasteItem, selectallItem,
-                        togglecommentItem, streamcommentItem, boxcommentItem, nestcommentItem,
-
+ showEOLItem, showSpaceItem,
-                        compileItem, runItem, buildItem, build_runItem, rebuildItem, BudItem, cleanItem,
-                        debugItem, debugbuildItem, debuginItem, debugrunItem, debugoverItem, debugreturnItem, debugstopItem, debugcleanbpsItem,
-
+
+
+
-                        
-    // static properties
@@ -337 +339 @@
-            });
-        }
+
+        with( showEOLItem = new MenuItem( menu, DWT.CHECK ) )
+        {
+            setImage( Globals.getImage( "topic" ) );
+            setData( LANG_ID, "view.eol" );
+            setSelection( false );
+            handleEvent( this, DWT.Selection, delegate( Event e ){
+                MenuItem mi = cast(MenuItem)e.widget;
+                EditItem ei = sGUI.editor.getSelectedEditItemHSU();
+                if( ei !is null )
+                {
+                    if( !ei.scintilla.getViewEOL() && mi.getSelection() )
+                        ei.scintilla.setViewEOL( true );
+                    else if( ei.scintilla.getViewEOL() && !mi.getSelection() )
+                        ei.scintilla.setViewEOL( false );
+                }
+            });
+        }
+
+        with( showSpaceItem = new MenuItem( menu, DWT.CHECK ) )
+        {
+            setImage( Globals.getImage( "topic" ) );
+            setData( LANG_ID, "view.space" );
+            setSelection( false );
+            handleEvent( this, DWT.Selection, delegate( Event e ){
+                MenuItem mi = cast(MenuItem)e.widget;
+                EditItem ei = sGUI.editor.getSelectedEditItemHSU();
+                
+                if( ei !is null )
+                {
+                    if( !ei.scintilla.getViewWS() && mi.getSelection() )
+                        ei.scintilla.setViewWS( 1 );
+                    else if( ei.scintilla.getViewWS() && !mi.getSelection() )
+                        ei.scintilla.setViewWS( 0 );
+                }
+            });
+        }       
-
-        /+
@@ -605 +644 @@
-        }
-        encodeItem.setMenu(EncodeMenu(encodeItem));
+
+        new MenuItem(menu, DWT.SEPARATOR);
+
+        with( setEOLItem = new MenuItem(menu, DWT.CASCADE)){
+            // always set the "language" string to in English
+            setData(LANG_ID,"tools.seteol");
+            handleEvent(this, DWT.Selection, delegate(Event e){
+            });
+        }
+        setEOLItem.setMenu(setEOLMenu(setEOLItem));
+        
+        with( EOLItem = new MenuItem(menu, DWT.CASCADE)){
+            // always set the "language" string to in English
+            setData(LANG_ID,"tools.eol");
+            setEnabled( false );
+            handleEvent(this, DWT.Selection, delegate(Event e){
+            });
+        }
+        EOLItem.setMenu(EOLMenu(EOLItem));
-
-        new MenuItem(menu, DWT.SEPARATOR);
@@ -689 +747 @@
-        return menu;
-    }
+
+    protected Menu setEOLMenu(MenuItem item)
+    {
+        char[][] keys = ["CRLF", "CR", "LF"];
+        char[][] icon = [ "windows", "mac", "linux" ];
+        Menu menu = new Menu(item);
+
+        for(int i = 0; i < 3; ++ i )
+        {
+            setEOLMenuItem[i] = new MenuItem(menu, DWT.RADIO);
+            setEOLMenuItem[i].setText(keys[i]);
+            setEOLMenuItem[i].setImage( Globals.getImage( icon[i] ) );
+            setEOLMenuItem[i].handleEvent(null, DWT.Selection, delegate(Event e)
+            {
+                MenuItem mi = cast(MenuItem)e.widget;
+                EditItem[] eis = cast(EditItem[]) sGUI.editor.getItems;
+                foreach( EditItem ei; eis )
+                {
+                    switch( mi.getText() )
+                    {
+                        case "CRLF":
+                            ei.scintilla.setEOLMode( 0 );
+                            break;
+                        case "LF":
+                            ei.scintilla.setEOLMode( 2 );
+                            break;
+                        case "CR":
+                            ei.scintilla.setEOLMode( 1 );
+                        break;
+                    }                   
+                }
+            });         
+        }
+
+        setEOLMenuItem[0].setSelection( true );
+        
+        return menu;
+    }   
+
+    protected Menu EOLMenu(MenuItem item)
+    {
+        char[][] keys = ["CRLF / WINDOWS", "CR / MAC", "LF / UNIX"];
+        char[][] icon = [ "windows", "mac", "linux" ];
+        Menu menu = new Menu(item);
+        int i = 0;
+        foreach(char[] name; keys)
+        {
+            MenuItem mi = new MenuItem(menu, DWT.PUSH);
+            mi.setText(name);
+            mi.setImage( Globals.getImage( icon[i++] ) );
+            mi.handleEvent(null, DWT.Selection, delegate(Event e)
+            {
+                MenuItem mi = cast(MenuItem)e.widget;
+                EditItem ei = sGUI.editor.getSelectedEditItemHSU();
+
+                if( ei !is null )
+                {
+                    char[] text = mi.getText();
+
+                    switch( text )
+                    {
+                        case "CRLF / WINDOWS":
+                            ei.scintilla.convertEOLs( 0 );
+                            break;
+
+                        case "LF / UNIX":
+                            ei.scintilla.convertEOLs( 2 );
+                            break;
+
+                        case "CR / MAC":
+                            ei.scintilla.convertEOLs( 1 );
+
+                        default:
+                    }
+                }
+            });
+        }
+        return menu;
+    }   
-
-    protected Menu RegisterMenu(MenuItem item)

trunk/current/poseidon/poseidon/controller/outline.d

@@ -166 +166 @@
-                    tItem.setData( t );
-                    treeItems ~= tItem;
-                    /*
-                    scope font = new Font( tree.getDisplay(), Editor.settings._setting.outputStyle.font, Editor.settings._setting.outputStyle.size, DWT.NORMAL );
-                    tItem.setFont( font );
-                    */
-                }else
-                {
@@ -175 +171 @@
-                    tItem.setData( t );
-                    treeItems ~= tItem;
-                    /*
-                    scope font = new Font( tree.getDisplay(), Editor.settings._setting.outputStyle.font, Editor.settings._setting.outputStyle.size, DWT.NORMAL );
-                    tItem.setFont( font );
-                    */
-                }
-
@@ -263 +255 @@
-        }
-    }
-
-
-    
-
-    /***
@@ -985 +974 @@
-    }
-
-    /*
-    private void resetImageCombo()
-    {
-        if( sAutoComplete.fileParser is null )
-        {
-            removeAllImageComboItems();
-            quickFind.select( -1 );
-            quickFind.setEnabled( false );
-        }
-        else
-        {
-            removeAllImageComboItems();
-            quickFind.setEnabled( true );
-            onCheckImageComboModify();
-        }
-    }
-    */
-
-    private void resetImageCombo( EditItem ei )
-    {
@@ -1103 +1074 @@
-            return true; 
-        
-
-        return bFound;
-        /+
-        sGUI.outputPanel.appendLine( "Items = " ~ std.string.toString( treeItems.length ) ~ "   " ~
-        "searchIndex = " ~ std.string.toString( searchIndex ) );+/
-        
-    }
-}

trunk/current/poseidon/poseidon/controller/toolbarmanager.d

@@ -460 +460 @@
-            
-            sGUI.menuMan.encodeItem.setEnabled( haveDoc );
+            sGUI.menuMan.EOLItem.setEnabled( haveDoc );
-        }   
-    }

trunk/current/poseidon/poseidon/globals.d

@@ -242 +242 @@
-        images["searchfunction"]    = DWTResourceManager.getImage("searchfuncion.gif");
-        images["compiletarget"]     = DWTResourceManager.getImage("target.gif");
+
+        images["windows"]       = DWTResourceManager.getImage("windows.gif");
+        images["mac"]           = DWTResourceManager.getImage("mac.gif");
+        images["linux"]         = DWTResourceManager.getImage("linux.gif");
+        images["topic"]         = DWTResourceManager.getImage("topic.gif");
-
-        // DEBUG

trunk/current/poseidon/poseidon/style/dstyle.d

@@ -2120 +2120 @@
-            try
-            {
-
+
+
+
+
+
+
+
+
+
+
-                
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                char[] codeSource;
-                CAnalyzerTreeNode headNode = searchFunctionHeadAndText( sc, codeSource );
@@ -2155 +2208 @@
-                    if( tempBlockParser is null ) return;
-
-                    //sGUI.outputPanel.appendLine( codeSource );
-                    
-                    //remove D_MAINROOT
-                    if( tempBlockParser.getLeafCount == 1 )
@@ -2162 +2213 @@
-                    else
-                        return;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-                CAnalyzerTreeNode       fatherNode = headNode.getRoot;
@@ -2190 +2235 @@
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            }
-            catch
-            {
+                
-            }
-
@@ -2913 +2936 @@
-                    case 1:
-                        char[] finalWord = splitSemiWord[length - 1];
+                        //sGUI.outputPanel.appendLine( "finalWord: " ~ finalWord );
-                        if( finalWord != "if" && finalWord != "while" && finalWord != "for" && finalWord != "foreach"
-                                && finalWord != "else" && finalWord != "version" && finalWord != "debug" 
-                                && finalWord != "catch" && finalWord != "switch" && finalWord != "with" 
-
+&& finalWord != "delegate" 
-                        {
-                            // 過載運算子及建構子
@@ -3392 +3416 @@
-                    case 1:
-                        char[] finalWord = splitSemiWord[length - 1];
+                        //sGUI.outputPanel.appendLine( "@finalWord: " ~ finalWord );
-                        if( finalWord != "if" && finalWord != "while" && finalWord != "for" && finalWord != "foreach"
-                                && finalWord != "else" && finalWord != "version" && finalWord != "debug"