From a7883699257a02f2ea9c9ed1ce3b53c966ecce4b Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 21 Jan 2015 16:17:57 +0300
Subject: [PATCH] add output panel; add character literal support in tokenizer;
 fix styles

---
 dlangide.visualdproj         |  1 +
 outputpanel.d                | 26 +++++++++++++
 res/stdres/theme_default.xml |  6 +--
 src/ddc/lexer/tokenizer.d    | 74 ++++++++++++++++++++++++++++++++++++
 src/dlangide/ui/frame.d      | 10 +++++
 src/dlangide/ui/wspanel.d    |  1 +
 6 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 outputpanel.d

diff --git a/dlangide.visualdproj b/dlangide.visualdproj
index 55ab84d..7fad869 100644
--- a/dlangide.visualdproj
+++ b/dlangide.visualdproj
@@ -202,6 +202,7 @@
    <Folder name="ui">
     <File path="src\dlangide\ui\commands.d" />
     <File path="src\dlangide\ui\frame.d" />
+    <File path="outputpanel.d" />
     <File path="src\dlangide\ui\wspanel.d" />
    </Folder>
    <Folder name="workspace">
diff --git a/outputpanel.d b/outputpanel.d
new file mode 100644
index 0000000..5e99610
--- /dev/null
+++ b/outputpanel.d
@@ -0,0 +1,26 @@
+module dlangide.ui.outputpanel;
+
+import dlangui.all;
+import dlangide.workspace.workspace;
+import dlangide.workspace.project;
+
+class OutputPanel : DockWindow {
+    protected LogWidget _logWidget;
+
+    this(string id) {
+        super(id);
+        _caption.text = "Output"d;
+        dockAlignment = DockAlignment.Bottom;
+    }
+
+    override protected Widget createBodyWidget() {
+        _logWidget = new LogWidget("logwidget");
+        _logWidget.readOnly = true;
+        _logWidget.layoutHeight(FILL_PARENT).layoutHeight(FILL_PARENT);
+        return _logWidget;
+    }
+
+    void addLogLines(string category, dstring[] msg...) {
+        _logWidget.appendLines(msg);
+    }
+}
diff --git a/res/stdres/theme_default.xml b/res/stdres/theme_default.xml
index eed0aa5..add1b54 100644
--- a/res/stdres/theme_default.xml
+++ b/res/stdres/theme_default.xml
@@ -302,15 +302,14 @@
         />
 
     <style id="TREE_ITEM"
-        padding="2,2,2,2"
-        margins="0,0,0,0"
+        padding="1,1,1,1"
         minWidth="100"
         minHeight="16"
         layoutWidth="FILL_PARENT"
         layoutHeight="WRAP_CONTENT"
         fontFace="Arial"
         fontFamily="SansSerif"
-        fontSize="16">
+        fontSize="12">
     </style>
     <style id="TREE_ITEM_EXPAND_ICON"
         margins="2,0,2,0"
@@ -333,6 +332,7 @@
         layoutHeight="WRAP_CONTENT"
         align="Left|VCenter"
         textFlags="Parent"
+	fontSize="12"
     />
     <style id="RESIZER_VERTICAL"
         layoutWidth="FILL_PARENT"
diff --git a/src/ddc/lexer/tokenizer.d b/src/ddc/lexer/tokenizer.d
index e1b98ed..44adf72 100644
--- a/src/ddc/lexer/tokenizer.d
+++ b/src/ddc/lexer/tokenizer.d
@@ -1209,6 +1209,29 @@ class StringLiteralToken : Token {
 	}
 }
 
+class CharacterLiteralToken : Token {
+	dchar _character;
+	dchar _literalType;
+	@property override dchar literalType() { return _literalType; }
+    @property dchar character() { return _character; }
+	@property override dchar[] text() { return [_character]; }
+	void setCharacter(dchar ch, dchar type) { _character = ch; _literalType = type; }
+	this() {
+		super(TokenType.CHARACTER);
+	}
+	this(SourceFile file, uint line, uint pos, dchar character, dchar type) {
+		super(TokenType.CHARACTER, file, line, pos);
+		_character = character;
+		_literalType = type;
+	}
+	override public Token clone() {
+		return new CharacterLiteralToken(_file, _line, _pos, _character, _literalType);
+	}
+	public override @property string toString() {
+		return "Char:" ~ toUTF8([_character]);
+	}
+}
+
 class IntegerLiteralToken : Token {
 	ulong _value;
 	bool _unsigned;
@@ -1361,6 +1384,7 @@ class Tokenizer
 	protected IntegerLiteralToken _sharedIntegerToken = new IntegerLiteralToken();
 	protected RealLiteralToken _sharedRealToken = new RealLiteralToken();
     protected InvalidToken _sharedInvalidToken = new InvalidToken();
+    protected CharacterLiteralToken _sharedCharacterLiteralToken = new CharacterLiteralToken();
 	protected StringAppender _stringLiteralAppender;
 	protected StringAppender _commentAppender;
 	protected StringAppender _identAppender;
@@ -1401,6 +1425,7 @@ class Tokenizer
 		_sharedIntegerToken.setFile(file);
 		_sharedRealToken.setFile(file);
         _sharedInvalidToken.setFile(file);
+        _sharedCharacterLiteralToken.setFile(file);
 		buildTime = Clock.currTime();
         _line = lineStream.line;
         _pos = 0;
@@ -2328,6 +2353,53 @@ class Tokenizer
 		}
 	}
 	
+    protected Token processCharacterLiteral() {
+		_sharedCharacterLiteralToken.setPos(_line, _pos - 1);
+        if (_pos + 2 > _len)
+            return parserError("Invalid character literal", _sharedCharacterLiteralToken);
+        dchar ch = _lineText[_pos++];
+        dchar ch2 = _lineText[_pos++];
+        dchar type = 0;
+        if (ch == '\\') {
+            // process escaped character - store it in ch
+            // TODO: support all escape sequences
+            switch(ch2) {
+                case 'r':
+                    ch = '\r';
+                    break;
+                case 'n':
+                    ch = '\n';
+                    break;
+                case 't':
+                    ch = '\t';
+                    break;
+                case '\\':
+                    ch = '\\';
+                    break;
+                default:
+                    ch = ch2;
+                    break;
+            }
+            // here must be closing '
+            if (_pos + 1 > _len)
+                return parserError("Invalid character literal", _sharedCharacterLiteralToken);
+            ch2 = _lineText[_pos++];
+        }
+        if (ch2 != '\'')
+            return parserError("Invalid character literal", _sharedCharacterLiteralToken);
+        if (_pos < _len) {
+            dchar t = _lineText[_pos];
+            if (t == 'd' || t == 'w' || t == 'c') {
+                type = t;
+                _pos++;
+            } else if (isIdentMiddleChar(ch)) {
+                return parserError("Unexpected character after character literal", _sharedCharacterLiteralToken);
+            }
+        }
+        _sharedCharacterLiteralToken.setCharacter(ch, type);
+        return _sharedCharacterLiteralToken;
+    }
+
 	protected Token processDoubleQuotedOrWysiwygString(dchar delimiter) {
 		bool wysiwyg = (delimiter == 'r' || delimiter == '`');
 		//writeln("processDoubleQuotedString()");
@@ -2455,6 +2527,8 @@ class Tokenizer
             return processOneLineSharpComment();
 		if (ch == '\"')
 			return processDoubleQuotedOrWysiwygString(ch);
+		if (ch == '\'')
+			return processCharacterLiteral();
 		if (ch == 'x' && next == '\"')
 			return processHexString();
 		if (ch == 'q' && next == '\"')
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index 8b12b30..bc3cbc1 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -14,6 +14,7 @@ import dlangui.dialogs.filedlg;
 
 import dlangide.ui.commands;
 import dlangide.ui.wspanel;
+import dlangide.ui.outputpanel;
 import dlangide.workspace.workspace;
 import dlangide.workspace.project;
 
@@ -144,6 +145,7 @@ class DSourceEdit : SourceEdit {
         setTokenHightlightColor(TokenCategory.Comment, 0x008000); // green
         setTokenHightlightColor(TokenCategory.Keyword, 0x0000FF); // blue
         setTokenHightlightColor(TokenCategory.String, 0xA31515);  // brown
+        setTokenHightlightColor(TokenCategory.Character, 0xA31515);  // brown
         setTokenHightlightColor(TokenCategory.Error, 0xFF0000);  // red
         setTokenHightlightColor(TokenCategory.Comment_Documentation, 0x206000);
         //setTokenHightlightColor(TokenCategory.Identifier, 0x206000);  // no colors
@@ -186,6 +188,7 @@ class IDEFrame : AppFrame {
 
     MenuItem mainMenuItems;
     WorkspacePanel _wsPanel;
+    OutputPanel _logPanel;
     DockHost _dockHost;
     TabWidget _tabs;
 
@@ -270,6 +273,13 @@ class IDEFrame : AppFrame {
         _wsPanel.sourceFileSelectionListener = &onSourceFileSelected;
         _dockHost.addDockedWindow(_wsPanel);
 
+        _logPanel = new OutputPanel("output");
+        _logPanel.addLogLines(null, "Line 1"d);
+        _logPanel.addLogLines(null, "Line 2"d);
+        _logPanel.addLogLines(null, "Line 3"d, "Line 4"d);
+
+        _dockHost.addDockedWindow(_logPanel);
+
         return _dockHost;
     }
 
diff --git a/src/dlangide/ui/wspanel.d b/src/dlangide/ui/wspanel.d
index 3a6d2a0..20190ed 100644
--- a/src/dlangide/ui/wspanel.d
+++ b/src/dlangide/ui/wspanel.d
@@ -57,6 +57,7 @@ class WorkspacePanel : DockWindow {
         _tree = new TreeWidget("wstree");
         _tree.layoutHeight(FILL_PARENT).layoutHeight(FILL_PARENT);
         _tree.selectionListener = &onTreeItemSelected;
+		_tree.fontSize = 12;
         return _tree;
     }