From 057e75f44b75a6b01a9f9c618c3d3835a5fb7f1b Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Mon, 11 Jan 2016 09:12:23 +0300 Subject: [PATCH] fix build errors after DCD integration --- dlangide_msvc.visualdproj | 74 ++++++++++++++++++++++++++++++++++ src/ddc/lexer/tokenizer.d | 4 +- src/dlangide/tools/d/dsyntax.d | 8 ++-- src/dlangide/ui/frame.d | 4 +- src/dlangide/ui/newfile.d | 4 +- src/dlangide/ui/newproject.d | 4 +- src/dlangide/ui/outputpanel.d | 2 +- src/dlangide/ui/watchpanel.d | 2 +- 8 files changed, 88 insertions(+), 14 deletions(-) diff --git a/dlangide_msvc.visualdproj b/dlangide_msvc.visualdproj index b07be13..a821311 100644 --- a/dlangide_msvc.visualdproj +++ b/dlangide_msvc.visualdproj @@ -473,6 +473,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ddc/lexer/tokenizer.d b/src/ddc/lexer/tokenizer.d index c686db8..aca4e17 100644 --- a/src/ddc/lexer/tokenizer.d +++ b/src/ddc/lexer/tokenizer.d @@ -1571,10 +1571,10 @@ class Tokenizer } this(SourceLines lineStream) { - init(lineStream); + initialize(lineStream); } - void init(SourceLines lineStream, int pos = 0) { + void initialize(SourceLines lineStream, int pos = 0) { _lineStream = lineStream; SourceFile file = _lineStream.file; _sharedWhiteSpaceToken.setFile(file); diff --git a/src/dlangide/tools/d/dsyntax.d b/src/dlangide/tools/d/dsyntax.d index 63c4dee..bdcad07 100644 --- a/src/dlangide/tools/d/dsyntax.d +++ b/src/dlangide/tools/d/dsyntax.d @@ -280,8 +280,8 @@ class SimpleDSyntaxSupport : SyntaxSupport { protected Token _lastToken; protected bool initTokenizer(TextPosition startPos) { const dstring[] lines = content.lines; - _lines.init(cast(dstring[])(lines[startPos.line .. $]), _file, startPos.line); - _tokenizer.init(_lines, startPos.pos); + _lines.initialize(cast(dstring[])(lines[startPos.line .. $]), _file, startPos.line); + _tokenizer.initialize(_lines, startPos.pos); _lastTokenStart = startPos; _lastToken = null; nextToken(); @@ -536,8 +536,8 @@ class SimpleDSyntaxSupport : SyntaxSupport { _props = props; changeStartLine = 0; changeEndLine = cast(int)lines.length; - _lines.init(lines[changeStartLine..$], _file, changeStartLine); - _tokenizer.init(_lines); + _lines.initialize(lines[changeStartLine..$], _file, changeStartLine); + _tokenizer.initialize(_lines); int tokenPos = 0; int tokenLine = 0; ubyte category = 0; diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index 5035671..2383152 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -262,14 +262,14 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL return true; } - override protected void init() { + override protected void initialize() { _appName = "dlangide"; //_editorTool = new DEditorTool(this); _settings = new IDESettings(buildNormalizedPath(settingsDir, "settings.json")); _settings.load(); _settings.updateDefaults(); _settings.save(); - super.init(); + super.initialize(); } /// move focus to editor in currently selected tab diff --git a/src/dlangide/ui/newfile.d b/src/dlangide/ui/newfile.d index 879fe55..47f0773 100644 --- a/src/dlangide/ui/newfile.d +++ b/src/dlangide/ui/newfile.d @@ -52,8 +52,8 @@ class NewFileDlg : Dialog { _location = folder.filename; } /// override to implement creation of dialog controls - override void init() { - super.init(); + override void initialize() { + super.initialize(); initTemplates(); Widget content; try { diff --git a/src/dlangide/ui/newproject.d b/src/dlangide/ui/newproject.d index 6731564..d9ad554 100644 --- a/src/dlangide/ui/newproject.d +++ b/src/dlangide/ui/newproject.d @@ -47,8 +47,8 @@ class NewProjectDlg : Dialog { } /// override to implement creation of dialog controls - override void init() { - super.init(); + override void initialize() { + super.initialize(); initTemplates(); Widget content; try { diff --git a/src/dlangide/ui/outputpanel.d b/src/dlangide/ui/outputpanel.d index c98c50f..974fe72 100644 --- a/src/dlangide/ui/outputpanel.d +++ b/src/dlangide/ui/outputpanel.d @@ -156,7 +156,7 @@ class OutputPanel : DockWindow { return _tabs; } - override protected void init() { + override protected void initialize() { //styleId = STYLE_DOCK_WINDOW; styleId = null; diff --git a/src/dlangide/ui/watchpanel.d b/src/dlangide/ui/watchpanel.d index 01aadda..d0d414f 100644 --- a/src/dlangide/ui/watchpanel.d +++ b/src/dlangide/ui/watchpanel.d @@ -78,7 +78,7 @@ class WatchPanel : DockWindow { return _tabs; } - override protected void init() { + override protected void initialize() { //styleId = STYLE_DOCK_WINDOW; styleId = null; //_caption.text = "Watch"d;