diff --git a/Irony.GrammarExplorer/fmGrammarExplorer.Designer.cs b/Irony.GrammarExplorer/fmGrammarExplorer.Designer.cs index b6f33f6..560f555 100644 --- a/Irony.GrammarExplorer/fmGrammarExplorer.Designer.cs +++ b/Irony.GrammarExplorer/fmGrammarExplorer.Designer.cs @@ -26,14 +26,14 @@ protected override void Dispose(bool disposing) { private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fmGrammarExplorer)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); this.tabGrammar = new System.Windows.Forms.TabControl(); this.pageTerminals = new System.Windows.Forms.TabPage(); this.txtTerms = new System.Windows.Forms.TextBox(); @@ -130,6 +130,7 @@ private void InitializeComponent() { this.label5 = new System.Windows.Forms.Label(); this.lblRunTime = new System.Windows.Forms.Label(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.btnRefresh = new System.Windows.Forms.Button(); this.tabGrammar.SuspendLayout(); this.pageTerminals.SuspendLayout(); this.pageNonTerms.SuspendLayout(); @@ -158,291 +159,270 @@ private void InitializeComponent() { this.pageOutput.SuspendLayout(); this.pnlRuntimeInfo.SuspendLayout(); this.SuspendLayout(); - // + // // tabGrammar - // + // this.tabGrammar.Controls.Add(this.pageTerminals); this.tabGrammar.Controls.Add(this.pageNonTerms); this.tabGrammar.Controls.Add(this.pageParserStates); this.tabGrammar.Controls.Add(this.pageTest); this.tabGrammar.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabGrammar.Location = new System.Drawing.Point(0, 36); - this.tabGrammar.Margin = new System.Windows.Forms.Padding(4); + this.tabGrammar.Location = new System.Drawing.Point(0, 29); this.tabGrammar.Name = "tabGrammar"; this.tabGrammar.SelectedIndex = 0; - this.tabGrammar.Size = new System.Drawing.Size(1472, 572); + this.tabGrammar.Size = new System.Drawing.Size(1022, 381); this.tabGrammar.TabIndex = 0; - // + // // pageTerminals - // + // this.pageTerminals.Controls.Add(this.txtTerms); - this.pageTerminals.Location = new System.Drawing.Point(4, 25); - this.pageTerminals.Margin = new System.Windows.Forms.Padding(4); + this.pageTerminals.Location = new System.Drawing.Point(4, 22); this.pageTerminals.Name = "pageTerminals"; - this.pageTerminals.Padding = new System.Windows.Forms.Padding(4); - this.pageTerminals.Size = new System.Drawing.Size(1464, 543); + this.pageTerminals.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageTerminals.Size = new System.Drawing.Size(1014, 355); this.pageTerminals.TabIndex = 5; this.pageTerminals.Text = "Terminals"; this.pageTerminals.UseVisualStyleBackColor = true; - // + // // txtTerms - // + // this.txtTerms.Dock = System.Windows.Forms.DockStyle.Fill; this.txtTerms.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtTerms.HideSelection = false; - this.txtTerms.Location = new System.Drawing.Point(4, 4); - this.txtTerms.Margin = new System.Windows.Forms.Padding(4); + this.txtTerms.Location = new System.Drawing.Point(3, 3); this.txtTerms.Multiline = true; this.txtTerms.Name = "txtTerms"; this.txtTerms.ReadOnly = true; this.txtTerms.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtTerms.Size = new System.Drawing.Size(1456, 535); + this.txtTerms.Size = new System.Drawing.Size(1008, 349); this.txtTerms.TabIndex = 2; - // + // // pageNonTerms - // + // this.pageNonTerms.Controls.Add(this.txtNonTerms); - this.pageNonTerms.Location = new System.Drawing.Point(4, 25); - this.pageNonTerms.Margin = new System.Windows.Forms.Padding(4); + this.pageNonTerms.Location = new System.Drawing.Point(4, 22); this.pageNonTerms.Name = "pageNonTerms"; - this.pageNonTerms.Padding = new System.Windows.Forms.Padding(4); - this.pageNonTerms.Size = new System.Drawing.Size(1464, 543); + this.pageNonTerms.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageNonTerms.Size = new System.Drawing.Size(1096, 439); this.pageNonTerms.TabIndex = 0; this.pageNonTerms.Text = "Non-Terminals"; this.pageNonTerms.UseVisualStyleBackColor = true; - // + // // txtNonTerms - // + // this.txtNonTerms.Dock = System.Windows.Forms.DockStyle.Fill; this.txtNonTerms.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtNonTerms.HideSelection = false; - this.txtNonTerms.Location = new System.Drawing.Point(4, 4); - this.txtNonTerms.Margin = new System.Windows.Forms.Padding(4); + this.txtNonTerms.Location = new System.Drawing.Point(3, 3); this.txtNonTerms.Multiline = true; this.txtNonTerms.Name = "txtNonTerms"; this.txtNonTerms.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtNonTerms.Size = new System.Drawing.Size(1456, 535); + this.txtNonTerms.Size = new System.Drawing.Size(1090, 433); this.txtNonTerms.TabIndex = 1; this.txtNonTerms.WordWrap = false; - // + // // pageParserStates - // + // this.pageParserStates.Controls.Add(this.txtParserStates); - this.pageParserStates.Location = new System.Drawing.Point(4, 25); - this.pageParserStates.Margin = new System.Windows.Forms.Padding(4); + this.pageParserStates.Location = new System.Drawing.Point(4, 22); this.pageParserStates.Name = "pageParserStates"; - this.pageParserStates.Padding = new System.Windows.Forms.Padding(4); - this.pageParserStates.Size = new System.Drawing.Size(1464, 543); + this.pageParserStates.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageParserStates.Size = new System.Drawing.Size(1096, 439); this.pageParserStates.TabIndex = 1; this.pageParserStates.Text = "Parser States"; this.pageParserStates.UseVisualStyleBackColor = true; - // + // // txtParserStates - // + // this.txtParserStates.Dock = System.Windows.Forms.DockStyle.Fill; this.txtParserStates.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtParserStates.HideSelection = false; - this.txtParserStates.Location = new System.Drawing.Point(4, 4); - this.txtParserStates.Margin = new System.Windows.Forms.Padding(4); + this.txtParserStates.Location = new System.Drawing.Point(3, 3); this.txtParserStates.Multiline = true; this.txtParserStates.Name = "txtParserStates"; this.txtParserStates.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtParserStates.Size = new System.Drawing.Size(1456, 535); + this.txtParserStates.Size = new System.Drawing.Size(1090, 433); this.txtParserStates.TabIndex = 2; this.txtParserStates.WordWrap = false; - // + // // pageTest - // + // this.pageTest.Controls.Add(this.txtSource); this.pageTest.Controls.Add(this.panel1); this.pageTest.Controls.Add(this.splitter3); this.pageTest.Controls.Add(this.tabOutput); - this.pageTest.Location = new System.Drawing.Point(4, 25); - this.pageTest.Margin = new System.Windows.Forms.Padding(4); + this.pageTest.Location = new System.Drawing.Point(4, 22); this.pageTest.Name = "pageTest"; - this.pageTest.Padding = new System.Windows.Forms.Padding(4); - this.pageTest.Size = new System.Drawing.Size(1464, 543); + this.pageTest.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageTest.Size = new System.Drawing.Size(1096, 439); this.pageTest.TabIndex = 4; this.pageTest.Text = "Test"; this.pageTest.UseVisualStyleBackColor = true; - // + // // txtSource - // + // this.txtSource.Dock = System.Windows.Forms.DockStyle.Fill; this.txtSource.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtSource.HideSelection = false; - this.txtSource.Location = new System.Drawing.Point(4, 41); - this.txtSource.Margin = new System.Windows.Forms.Padding(4); + this.txtSource.Location = new System.Drawing.Point(3, 33); this.txtSource.Name = "txtSource"; - this.txtSource.Size = new System.Drawing.Size(981, 498); + this.txtSource.Size = new System.Drawing.Size(734, 403); this.txtSource.TabIndex = 22; this.txtSource.Text = ""; this.txtSource.TextChanged += new System.EventHandler(this.txtSource_TextChanged); - // + // // panel1 - // + // this.panel1.Controls.Add(this.btnLocate); this.panel1.Controls.Add(this.chkDisableHili); this.panel1.Controls.Add(this.btnRun); this.panel1.Controls.Add(this.btnFileOpen); this.panel1.Controls.Add(this.btnParse); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(4, 4); - this.panel1.Margin = new System.Windows.Forms.Padding(4); + this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(981, 37); + this.panel1.Size = new System.Drawing.Size(734, 30); this.panel1.TabIndex = 2; - // + // // btnLocate - // + // this.btnLocate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnLocate.Location = new System.Drawing.Point(883, 4); - this.btnLocate.Margin = new System.Windows.Forms.Padding(4); + this.btnLocate.Location = new System.Drawing.Point(660, 3); this.btnLocate.Name = "btnLocate"; - this.btnLocate.Size = new System.Drawing.Size(87, 28); + this.btnLocate.Size = new System.Drawing.Size(65, 23); this.btnLocate.TabIndex = 10; this.btnLocate.Text = "Locate >>"; this.toolTip.SetToolTip(this.btnLocate, "Locate the source position in parse/Ast tree. "); this.btnLocate.UseVisualStyleBackColor = true; this.btnLocate.Click += new System.EventHandler(this.btnLocate_Click); - // + // // chkDisableHili - // + // this.chkDisableHili.AutoSize = true; - this.chkDisableHili.Location = new System.Drawing.Point(7, 9); - this.chkDisableHili.Margin = new System.Windows.Forms.Padding(4); + this.chkDisableHili.Location = new System.Drawing.Point(5, 7); this.chkDisableHili.Name = "chkDisableHili"; - this.chkDisableHili.Size = new System.Drawing.Size(197, 21); + this.chkDisableHili.Size = new System.Drawing.Size(150, 17); this.chkDisableHili.TabIndex = 9; this.chkDisableHili.Text = "Disable syntax highlighting"; this.chkDisableHili.UseVisualStyleBackColor = true; this.chkDisableHili.CheckedChanged += new System.EventHandler(this.chkDisableHili_CheckedChanged); - // + // // btnRun - // + // this.btnRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnRun.Location = new System.Drawing.Point(787, 4); - this.btnRun.Margin = new System.Windows.Forms.Padding(4); + this.btnRun.Location = new System.Drawing.Point(588, 3); this.btnRun.Name = "btnRun"; - this.btnRun.Size = new System.Drawing.Size(87, 28); + this.btnRun.Size = new System.Drawing.Size(65, 23); this.btnRun.TabIndex = 7; this.btnRun.Text = "Run"; this.toolTip.SetToolTip(this.btnRun, "Run the source sample"); this.btnRun.UseVisualStyleBackColor = true; this.btnRun.Click += new System.EventHandler(this.btnRun_Click); - // + // // btnFileOpen - // + // this.btnFileOpen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnFileOpen.Location = new System.Drawing.Point(595, 4); - this.btnFileOpen.Margin = new System.Windows.Forms.Padding(4); + this.btnFileOpen.Location = new System.Drawing.Point(444, 3); this.btnFileOpen.Name = "btnFileOpen"; - this.btnFileOpen.Size = new System.Drawing.Size(87, 28); + this.btnFileOpen.Size = new System.Drawing.Size(65, 23); this.btnFileOpen.TabIndex = 6; this.btnFileOpen.Text = "Load ..."; this.toolTip.SetToolTip(this.btnFileOpen, "Load a source sample..."); this.btnFileOpen.UseVisualStyleBackColor = true; this.btnFileOpen.Click += new System.EventHandler(this.btnFileOpen_Click); - // + // // btnParse - // + // this.btnParse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnParse.Location = new System.Drawing.Point(689, 4); - this.btnParse.Margin = new System.Windows.Forms.Padding(4); + this.btnParse.Location = new System.Drawing.Point(515, 3); this.btnParse.Name = "btnParse"; - this.btnParse.Size = new System.Drawing.Size(89, 28); + this.btnParse.Size = new System.Drawing.Size(67, 23); this.btnParse.TabIndex = 1; this.btnParse.Text = "Parse"; this.toolTip.SetToolTip(this.btnParse, "Parse source sample"); this.btnParse.UseVisualStyleBackColor = true; this.btnParse.Click += new System.EventHandler(this.btnParse_Click); - // + // // splitter3 - // + // this.splitter3.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter3.Location = new System.Drawing.Point(985, 4); - this.splitter3.Margin = new System.Windows.Forms.Padding(4); + this.splitter3.Location = new System.Drawing.Point(737, 3); this.splitter3.Name = "splitter3"; - this.splitter3.Size = new System.Drawing.Size(8, 535); + this.splitter3.Size = new System.Drawing.Size(6, 433); this.splitter3.TabIndex = 14; this.splitter3.TabStop = false; - // + // // tabOutput - // + // this.tabOutput.Controls.Add(this.pageSyntaxTree); this.tabOutput.Controls.Add(this.pageAst); this.tabOutput.Dock = System.Windows.Forms.DockStyle.Right; - this.tabOutput.Location = new System.Drawing.Point(993, 4); - this.tabOutput.Margin = new System.Windows.Forms.Padding(4); + this.tabOutput.Location = new System.Drawing.Point(743, 3); this.tabOutput.Name = "tabOutput"; this.tabOutput.SelectedIndex = 0; - this.tabOutput.Size = new System.Drawing.Size(467, 535); + this.tabOutput.Size = new System.Drawing.Size(350, 433); this.tabOutput.TabIndex = 13; - // + // // pageSyntaxTree - // + // this.pageSyntaxTree.Controls.Add(this.tvParseTree); this.pageSyntaxTree.ForeColor = System.Drawing.SystemColors.ControlText; - this.pageSyntaxTree.Location = new System.Drawing.Point(4, 25); - this.pageSyntaxTree.Margin = new System.Windows.Forms.Padding(4); + this.pageSyntaxTree.Location = new System.Drawing.Point(4, 22); this.pageSyntaxTree.Name = "pageSyntaxTree"; - this.pageSyntaxTree.Padding = new System.Windows.Forms.Padding(4); - this.pageSyntaxTree.Size = new System.Drawing.Size(459, 506); + this.pageSyntaxTree.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageSyntaxTree.Size = new System.Drawing.Size(342, 407); this.pageSyntaxTree.TabIndex = 1; this.pageSyntaxTree.Text = "Parse Tree"; this.pageSyntaxTree.UseVisualStyleBackColor = true; - // + // // tvParseTree - // + // this.tvParseTree.Dock = System.Windows.Forms.DockStyle.Fill; this.tvParseTree.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tvParseTree.HideSelection = false; this.tvParseTree.Indent = 16; - this.tvParseTree.Location = new System.Drawing.Point(4, 4); - this.tvParseTree.Margin = new System.Windows.Forms.Padding(4); + this.tvParseTree.Location = new System.Drawing.Point(3, 3); this.tvParseTree.Name = "tvParseTree"; - this.tvParseTree.Size = new System.Drawing.Size(451, 498); + this.tvParseTree.Size = new System.Drawing.Size(336, 401); this.tvParseTree.TabIndex = 0; this.tvParseTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvParseTree_AfterSelect); - // + // // pageAst - // + // this.pageAst.Controls.Add(this.tvAst); - this.pageAst.Location = new System.Drawing.Point(4, 25); - this.pageAst.Margin = new System.Windows.Forms.Padding(4); + this.pageAst.Location = new System.Drawing.Point(4, 22); this.pageAst.Name = "pageAst"; - this.pageAst.Padding = new System.Windows.Forms.Padding(4); - this.pageAst.Size = new System.Drawing.Size(459, 506); + this.pageAst.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageAst.Size = new System.Drawing.Size(342, 409); this.pageAst.TabIndex = 0; this.pageAst.Text = "AST"; this.pageAst.UseVisualStyleBackColor = true; - // + // // tvAst - // + // this.tvAst.Dock = System.Windows.Forms.DockStyle.Fill; this.tvAst.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tvAst.HideSelection = false; this.tvAst.Indent = 16; - this.tvAst.Location = new System.Drawing.Point(4, 4); - this.tvAst.Margin = new System.Windows.Forms.Padding(4); + this.tvAst.Location = new System.Drawing.Point(3, 3); this.tvAst.Name = "tvAst"; - this.tvAst.Size = new System.Drawing.Size(451, 498); + this.tvAst.Size = new System.Drawing.Size(336, 403); this.tvAst.TabIndex = 1; this.tvAst.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvAst_AfterSelect); - // + // // chkParserTrace - // + // this.chkParserTrace.AutoSize = true; - this.chkParserTrace.Location = new System.Drawing.Point(4, 4); - this.chkParserTrace.Margin = new System.Windows.Forms.Padding(4); + this.chkParserTrace.Location = new System.Drawing.Point(3, 3); this.chkParserTrace.Name = "chkParserTrace"; - this.chkParserTrace.Size = new System.Drawing.Size(115, 21); + this.chkParserTrace.Size = new System.Drawing.Size(90, 17); this.chkParserTrace.TabIndex = 0; this.chkParserTrace.Text = "Enable Trace"; this.chkParserTrace.UseVisualStyleBackColor = true; - // + // // pnlLang - // + // + this.pnlLang.Controls.Add(this.btnRefresh); this.pnlLang.Controls.Add(this.chkAutoRefresh); this.pnlLang.Controls.Add(this.btnManageGrammars); this.pnlLang.Controls.Add(this.lblSearchError); @@ -452,94 +432,91 @@ private void InitializeComponent() { this.pnlLang.Controls.Add(this.cboGrammars); this.pnlLang.Dock = System.Windows.Forms.DockStyle.Top; this.pnlLang.Location = new System.Drawing.Point(0, 0); - this.pnlLang.Margin = new System.Windows.Forms.Padding(4); this.pnlLang.Name = "pnlLang"; - this.pnlLang.Size = new System.Drawing.Size(1472, 36); + this.pnlLang.Size = new System.Drawing.Size(1022, 29); this.pnlLang.TabIndex = 13; - // + // // chkAutoRefresh - // + // this.chkAutoRefresh.AutoSize = true; this.chkAutoRefresh.Checked = true; this.chkAutoRefresh.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAutoRefresh.Location = new System.Drawing.Point(459, 7); - this.chkAutoRefresh.Margin = new System.Windows.Forms.Padding(4); + this.chkAutoRefresh.Location = new System.Drawing.Point(401, 7); this.chkAutoRefresh.Name = "chkAutoRefresh"; - this.chkAutoRefresh.Size = new System.Drawing.Size(109, 21); + this.chkAutoRefresh.Size = new System.Drawing.Size(83, 17); this.chkAutoRefresh.TabIndex = 13; this.chkAutoRefresh.Text = "Auto-refresh"; this.toolTip.SetToolTip(this.chkAutoRefresh, resources.GetString("chkAutoRefresh.ToolTip")); this.chkAutoRefresh.UseVisualStyleBackColor = true; - // + // // btnManageGrammars - // - this.btnManageGrammars.Location = new System.Drawing.Point(408, 2); - this.btnManageGrammars.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + // + this.btnManageGrammars.Location = new System.Drawing.Point(306, 2); + this.btnManageGrammars.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnManageGrammars.Name = "btnManageGrammars"; - this.btnManageGrammars.Size = new System.Drawing.Size(37, 30); + this.btnManageGrammars.Size = new System.Drawing.Size(28, 24); this.btnManageGrammars.TabIndex = 12; this.btnManageGrammars.Text = "..."; this.btnManageGrammars.UseVisualStyleBackColor = true; this.btnManageGrammars.Click += new System.EventHandler(this.btnManageGrammars_Click); - // + // // lblSearchError - // + // this.lblSearchError.AutoSize = true; this.lblSearchError.ForeColor = System.Drawing.Color.Red; - this.lblSearchError.Location = new System.Drawing.Point(975, 11); + this.lblSearchError.Location = new System.Drawing.Point(731, 9); + this.lblSearchError.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblSearchError.Name = "lblSearchError"; - this.lblSearchError.Size = new System.Drawing.Size(70, 17); + this.lblSearchError.Size = new System.Drawing.Size(54, 13); this.lblSearchError.TabIndex = 11; this.lblSearchError.Text = "Not found"; this.lblSearchError.Visible = false; - // + // // btnSearch - // - this.btnSearch.Location = new System.Drawing.Point(896, 5); - this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + // + this.btnSearch.Location = new System.Drawing.Point(672, 2); + this.btnSearch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(73, 28); + this.btnSearch.Size = new System.Drawing.Size(55, 24); this.btnSearch.TabIndex = 10; this.btnSearch.Text = "Find"; this.btnSearch.UseVisualStyleBackColor = true; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // + // // txtSearch - // + // this.txtSearch.AcceptsReturn = true; this.txtSearch.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::Irony.GrammarExplorer.Properties.Settings.Default, "SearchPattern", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.txtSearch.Location = new System.Drawing.Point(727, 5); - this.txtSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtSearch.Location = new System.Drawing.Point(545, 4); + this.txtSearch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.txtSearch.Name = "txtSearch"; - this.txtSearch.Size = new System.Drawing.Size(163, 22); + this.txtSearch.Size = new System.Drawing.Size(123, 20); this.txtSearch.TabIndex = 8; this.txtSearch.Text = global::Irony.GrammarExplorer.Properties.Settings.Default.SearchPattern; this.txtSearch.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtSearch_KeyPress); - // + // // label2 - // + // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(13, 7); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(10, 6); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(71, 17); + this.label2.Size = new System.Drawing.Size(52, 13); this.label2.TabIndex = 4; this.label2.Text = "Grammar:"; - // + // // cboGrammars - // + // this.cboGrammars.ContextMenuStrip = this.menuGrammars; this.cboGrammars.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboGrammars.FormattingEnabled = true; - this.cboGrammars.Location = new System.Drawing.Point(89, 4); - this.cboGrammars.Margin = new System.Windows.Forms.Padding(4); + this.cboGrammars.Location = new System.Drawing.Point(67, 3); this.cboGrammars.Name = "cboGrammars"; - this.cboGrammars.Size = new System.Drawing.Size(311, 24); + this.cboGrammars.Size = new System.Drawing.Size(234, 21); this.cboGrammars.TabIndex = 3; this.cboGrammars.SelectedIndexChanged += new System.EventHandler(this.cboGrammars_SelectedIndexChanged); - // + // // menuGrammars - // + // this.menuGrammars.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.miAdd, this.miRemove, @@ -547,75 +524,72 @@ private void InitializeComponent() { this.menuGrammars.Name = "menuGrammars"; this.menuGrammars.Size = new System.Drawing.Size(164, 70); this.menuGrammars.Opening += new System.ComponentModel.CancelEventHandler(this.menuGrammars_Opening); - // + // // miAdd - // + // this.miAdd.Name = "miAdd"; this.miAdd.Size = new System.Drawing.Size(163, 22); this.miAdd.Text = "Add grammar..."; this.miAdd.Click += new System.EventHandler(this.miAdd_Click); - // + // // miRemove - // + // this.miRemove.Name = "miRemove"; this.miRemove.Size = new System.Drawing.Size(163, 22); this.miRemove.Text = "Remove selected"; this.miRemove.Click += new System.EventHandler(this.miRemove_Click); - // + // // miRemoveAll - // + // this.miRemoveAll.Name = "miRemoveAll"; this.miRemoveAll.Size = new System.Drawing.Size(163, 22); this.miRemoveAll.Text = "Remove all"; this.miRemoveAll.Click += new System.EventHandler(this.miRemoveAll_Click); - // + // // dlgSelectAssembly - // + // this.dlgSelectAssembly.DefaultExt = "dll"; this.dlgSelectAssembly.Filter = "DLL files|*.dll"; this.dlgSelectAssembly.Title = "Select Grammar Assembly "; - // + // // splitBottom - // + // this.splitBottom.BackColor = System.Drawing.SystemColors.Control; this.splitBottom.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.splitBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitBottom.Location = new System.Drawing.Point(0, 608); - this.splitBottom.Margin = new System.Windows.Forms.Padding(4); + this.splitBottom.Location = new System.Drawing.Point(0, 410); this.splitBottom.Name = "splitBottom"; - this.splitBottom.Size = new System.Drawing.Size(1472, 6); + this.splitBottom.Size = new System.Drawing.Size(1022, 6); this.splitBottom.TabIndex = 22; this.splitBottom.TabStop = false; - // + // // tabBottom - // + // this.tabBottom.Controls.Add(this.pageLanguage); this.tabBottom.Controls.Add(this.pageGrammarErrors); this.tabBottom.Controls.Add(this.pageParserOutput); this.tabBottom.Controls.Add(this.pageParserTrace); this.tabBottom.Controls.Add(this.pageOutput); this.tabBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tabBottom.Location = new System.Drawing.Point(0, 614); - this.tabBottom.Margin = new System.Windows.Forms.Padding(4); + this.tabBottom.Location = new System.Drawing.Point(0, 416); this.tabBottom.Name = "tabBottom"; this.tabBottom.SelectedIndex = 0; - this.tabBottom.Size = new System.Drawing.Size(1472, 230); + this.tabBottom.Size = new System.Drawing.Size(1022, 187); this.tabBottom.TabIndex = 0; - // + // // pageLanguage - // + // this.pageLanguage.Controls.Add(this.grpLanguageInfo); - this.pageLanguage.Location = new System.Drawing.Point(4, 25); - this.pageLanguage.Margin = new System.Windows.Forms.Padding(4); + this.pageLanguage.Location = new System.Drawing.Point(4, 22); this.pageLanguage.Name = "pageLanguage"; - this.pageLanguage.Padding = new System.Windows.Forms.Padding(4); - this.pageLanguage.Size = new System.Drawing.Size(1464, 201); + this.pageLanguage.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageLanguage.Size = new System.Drawing.Size(1014, 161); this.pageLanguage.TabIndex = 1; this.pageLanguage.Text = "Grammar Info"; this.pageLanguage.UseVisualStyleBackColor = true; - // + // // grpLanguageInfo - // + // this.grpLanguageInfo.Controls.Add(this.label8); this.grpLanguageInfo.Controls.Add(this.lblParserStateCount); this.grpLanguageInfo.Controls.Add(this.lblLanguageDescr); @@ -629,147 +603,132 @@ private void InitializeComponent() { this.grpLanguageInfo.Controls.Add(this.label6); this.grpLanguageInfo.Controls.Add(this.lblParserConstrTime); this.grpLanguageInfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpLanguageInfo.Location = new System.Drawing.Point(4, 4); - this.grpLanguageInfo.Margin = new System.Windows.Forms.Padding(4); + this.grpLanguageInfo.Location = new System.Drawing.Point(3, 3); this.grpLanguageInfo.Name = "grpLanguageInfo"; - this.grpLanguageInfo.Padding = new System.Windows.Forms.Padding(4); - this.grpLanguageInfo.Size = new System.Drawing.Size(1456, 193); + this.grpLanguageInfo.Size = new System.Drawing.Size(1008, 155); this.grpLanguageInfo.TabIndex = 3; this.grpLanguageInfo.TabStop = false; - // + // // label8 - // + // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(8, 139); - this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label8.Location = new System.Drawing.Point(6, 113); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(128, 17); + this.label8.Size = new System.Drawing.Size(96, 13); this.label8.TabIndex = 26; this.label8.Text = "Parser state count:"; - // + // // lblParserStateCount - // + // this.lblParserStateCount.AutoSize = true; - this.lblParserStateCount.Location = new System.Drawing.Point(223, 139); - this.lblParserStateCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblParserStateCount.Location = new System.Drawing.Point(167, 113); this.lblParserStateCount.Name = "lblParserStateCount"; - this.lblParserStateCount.Size = new System.Drawing.Size(16, 17); + this.lblParserStateCount.Size = new System.Drawing.Size(13, 13); this.lblParserStateCount.TabIndex = 25; this.lblParserStateCount.Text = "0"; - // + // // lblLanguageDescr - // - this.lblLanguageDescr.Location = new System.Drawing.Point(143, 47); - this.lblLanguageDescr.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + this.lblLanguageDescr.Location = new System.Drawing.Point(107, 38); this.lblLanguageDescr.Name = "lblLanguageDescr"; - this.lblLanguageDescr.Size = new System.Drawing.Size(817, 27); + this.lblLanguageDescr.Size = new System.Drawing.Size(613, 22); this.lblLanguageDescr.TabIndex = 24; this.lblLanguageDescr.Text = "(description)"; - // + // // txtGrammarComments - // + // this.txtGrammarComments.BackColor = System.Drawing.SystemColors.Window; this.txtGrammarComments.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtGrammarComments.Location = new System.Drawing.Point(148, 78); - this.txtGrammarComments.Margin = new System.Windows.Forms.Padding(4); + this.txtGrammarComments.Location = new System.Drawing.Point(111, 63); this.txtGrammarComments.Multiline = true; this.txtGrammarComments.Name = "txtGrammarComments"; this.txtGrammarComments.ReadOnly = true; - this.txtGrammarComments.Size = new System.Drawing.Size(812, 58); + this.txtGrammarComments.Size = new System.Drawing.Size(609, 47); this.txtGrammarComments.TabIndex = 23; - // + // // label11 - // + // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(8, 75); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(6, 61); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(134, 17); + this.label11.Size = new System.Drawing.Size(99, 13); this.label11.TabIndex = 22; this.label11.Text = "Grammar Comment:"; - // + // // label9 - // + // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(8, 47); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Location = new System.Drawing.Point(6, 38); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(83, 17); + this.label9.Size = new System.Drawing.Size(63, 13); this.label9.TabIndex = 20; this.label9.Text = "Description:"; - // + // // lblLanguageVersion - // - this.lblLanguageVersion.Location = new System.Drawing.Point(371, 20); - this.lblLanguageVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + this.lblLanguageVersion.Location = new System.Drawing.Point(278, 16); this.lblLanguageVersion.Name = "lblLanguageVersion"; - this.lblLanguageVersion.Size = new System.Drawing.Size(107, 21); + this.lblLanguageVersion.Size = new System.Drawing.Size(80, 17); this.lblLanguageVersion.TabIndex = 19; this.lblLanguageVersion.Text = "(Version)"; - // + // // label10 - // + // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(303, 20); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(227, 16); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(60, 17); + this.label10.Size = new System.Drawing.Size(45, 13); this.label10.TabIndex = 18; this.label10.Text = "Version:"; - // + // // lblLanguage - // - this.lblLanguage.Location = new System.Drawing.Point(143, 20); - this.lblLanguage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + this.lblLanguage.Location = new System.Drawing.Point(107, 16); this.lblLanguage.Name = "lblLanguage"; - this.lblLanguage.Size = new System.Drawing.Size(307, 21); + this.lblLanguage.Size = new System.Drawing.Size(230, 17); this.lblLanguage.TabIndex = 17; this.lblLanguage.Text = "(Language name)"; - // + // // label4 - // + // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(8, 20); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(6, 16); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(76, 17); + this.label4.Size = new System.Drawing.Size(58, 13); this.label4.TabIndex = 16; this.label4.Text = "Language:"; - // + // // label6 - // + // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(8, 162); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(6, 132); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(191, 17); + this.label6.Size = new System.Drawing.Size(142, 13); this.label6.TabIndex = 15; this.label6.Text = "Parser construction time, ms:"; - // + // // lblParserConstrTime - // + // this.lblParserConstrTime.AutoSize = true; - this.lblParserConstrTime.Location = new System.Drawing.Point(223, 162); - this.lblParserConstrTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblParserConstrTime.Location = new System.Drawing.Point(167, 132); this.lblParserConstrTime.Name = "lblParserConstrTime"; - this.lblParserConstrTime.Size = new System.Drawing.Size(16, 17); + this.lblParserConstrTime.Size = new System.Drawing.Size(13, 13); this.lblParserConstrTime.TabIndex = 14; this.lblParserConstrTime.Text = "0"; - // + // // pageGrammarErrors - // + // this.pageGrammarErrors.Controls.Add(this.gridGrammarErrors); - this.pageGrammarErrors.Location = new System.Drawing.Point(4, 25); - this.pageGrammarErrors.Margin = new System.Windows.Forms.Padding(4); + this.pageGrammarErrors.Location = new System.Drawing.Point(4, 22); this.pageGrammarErrors.Name = "pageGrammarErrors"; - this.pageGrammarErrors.Padding = new System.Windows.Forms.Padding(4); - this.pageGrammarErrors.Size = new System.Drawing.Size(1464, 201); + this.pageGrammarErrors.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageGrammarErrors.Size = new System.Drawing.Size(1096, 161); this.pageGrammarErrors.TabIndex = 4; this.pageGrammarErrors.Text = "Grammar Errors"; this.pageGrammarErrors.UseVisualStyleBackColor = true; - // + // // gridGrammarErrors - // + // this.gridGrammarErrors.AllowUserToAddRows = false; this.gridGrammarErrors.AllowUserToDeleteRows = false; this.gridGrammarErrors.ColumnHeadersHeight = 24; @@ -779,79 +738,75 @@ private void InitializeComponent() { this.dataGridViewTextBoxColumn5, this.dataGridViewTextBoxColumn6}); this.gridGrammarErrors.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridGrammarErrors.Location = new System.Drawing.Point(4, 4); - this.gridGrammarErrors.Margin = new System.Windows.Forms.Padding(4); + this.gridGrammarErrors.Location = new System.Drawing.Point(3, 3); this.gridGrammarErrors.MultiSelect = false; this.gridGrammarErrors.Name = "gridGrammarErrors"; this.gridGrammarErrors.ReadOnly = true; this.gridGrammarErrors.RowHeadersVisible = false; this.gridGrammarErrors.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.gridGrammarErrors.Size = new System.Drawing.Size(1453, 191); + this.gridGrammarErrors.Size = new System.Drawing.Size(1090, 155); this.gridGrammarErrors.TabIndex = 3; this.gridGrammarErrors.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gridGrammarErrors_CellDoubleClick); - // + // // dataGridViewTextBoxColumn2 - // - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle1; + // + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle17; this.dataGridViewTextBoxColumn2.HeaderText = "Error Level"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; this.dataGridViewTextBoxColumn2.ReadOnly = true; this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn2.ToolTipText = "Double-click grid cell to locate in source code"; - // + // // dataGridViewTextBoxColumn5 - // - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2; + // + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle18; this.dataGridViewTextBoxColumn5.HeaderText = "Description"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.ReadOnly = true; this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn5.Width = 800; - // + // // dataGridViewTextBoxColumn6 - // + // this.dataGridViewTextBoxColumn6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; this.dataGridViewTextBoxColumn6.DataPropertyName = "State"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle19; this.dataGridViewTextBoxColumn6.HeaderText = "Parser State"; this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; this.dataGridViewTextBoxColumn6.ReadOnly = true; this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn6.ToolTipText = "Double-click grid cell to navigate to state details"; - this.dataGridViewTextBoxColumn6.Width = 93; - // + this.dataGridViewTextBoxColumn6.Width = 71; + // // pageParserOutput - // + // this.pageParserOutput.Controls.Add(this.groupBox1); this.pageParserOutput.Controls.Add(this.grpCompileInfo); - this.pageParserOutput.Location = new System.Drawing.Point(4, 25); - this.pageParserOutput.Margin = new System.Windows.Forms.Padding(4); + this.pageParserOutput.Location = new System.Drawing.Point(4, 22); this.pageParserOutput.Name = "pageParserOutput"; - this.pageParserOutput.Padding = new System.Windows.Forms.Padding(4); - this.pageParserOutput.Size = new System.Drawing.Size(1464, 201); + this.pageParserOutput.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageParserOutput.Size = new System.Drawing.Size(1096, 161); this.pageParserOutput.TabIndex = 2; this.pageParserOutput.Text = "Parser Output"; this.pageParserOutput.UseVisualStyleBackColor = true; - // + // // groupBox1 - // + // this.groupBox1.Controls.Add(this.gridCompileErrors); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(211, 4); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(158, 3); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(1249, 193); + this.groupBox1.Size = new System.Drawing.Size(935, 155); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Compile Errors"; - // + // // gridCompileErrors - // + // this.gridCompileErrors.AllowUserToAddRows = false; this.gridCompileErrors.AllowUserToDeleteRows = false; this.gridCompileErrors.ColumnHeadersHeight = 24; @@ -861,55 +816,54 @@ private void InitializeComponent() { this.dataGridViewTextBoxColumn4, this.dataGridViewTextBoxColumn1}); this.gridCompileErrors.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridCompileErrors.Location = new System.Drawing.Point(4, 19); - this.gridCompileErrors.Margin = new System.Windows.Forms.Padding(4); + this.gridCompileErrors.Location = new System.Drawing.Point(3, 16); this.gridCompileErrors.MultiSelect = false; this.gridCompileErrors.Name = "gridCompileErrors"; this.gridCompileErrors.ReadOnly = true; this.gridCompileErrors.RowHeadersVisible = false; this.gridCompileErrors.RowTemplate.Height = 24; this.gridCompileErrors.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.gridCompileErrors.Size = new System.Drawing.Size(1241, 170); + this.gridCompileErrors.Size = new System.Drawing.Size(929, 136); this.gridCompileErrors.TabIndex = 2; this.gridCompileErrors.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gridCompileErrors_CellDoubleClick); - // + // // dataGridViewTextBoxColumn3 - // - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle4; + // + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle20; this.dataGridViewTextBoxColumn3.HeaderText = "L, C"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; this.dataGridViewTextBoxColumn3.ReadOnly = true; this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn3.ToolTipText = "Double-click grid cell to locate in source code"; this.dataGridViewTextBoxColumn3.Width = 50; - // + // // dataGridViewTextBoxColumn4 - // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle5; + // + dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle21; this.dataGridViewTextBoxColumn4.HeaderText = "Error Message"; this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; this.dataGridViewTextBoxColumn4.ReadOnly = true; this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn4.Width = 1000; - // + // // dataGridViewTextBoxColumn1 - // + // this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; this.dataGridViewTextBoxColumn1.DataPropertyName = "State"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle22; this.dataGridViewTextBoxColumn1.HeaderText = "Parser State"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.ReadOnly = true; this.dataGridViewTextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.dataGridViewTextBoxColumn1.ToolTipText = "Double-click grid cell to navigate to state details"; - this.dataGridViewTextBoxColumn1.Width = 93; - // + this.dataGridViewTextBoxColumn1.Width = 71; + // // grpCompileInfo - // + // this.grpCompileInfo.Controls.Add(this.label12); this.grpCompileInfo.Controls.Add(this.lblParseErrorCount); this.grpCompileInfo.Controls.Add(this.label1); @@ -919,125 +873,112 @@ private void InitializeComponent() { this.grpCompileInfo.Controls.Add(this.label3); this.grpCompileInfo.Controls.Add(this.lblSrcTokenCount); this.grpCompileInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.grpCompileInfo.Location = new System.Drawing.Point(4, 4); - this.grpCompileInfo.Margin = new System.Windows.Forms.Padding(4); + this.grpCompileInfo.Location = new System.Drawing.Point(3, 3); this.grpCompileInfo.Name = "grpCompileInfo"; - this.grpCompileInfo.Padding = new System.Windows.Forms.Padding(4); - this.grpCompileInfo.Size = new System.Drawing.Size(207, 193); + this.grpCompileInfo.Size = new System.Drawing.Size(155, 155); this.grpCompileInfo.TabIndex = 5; this.grpCompileInfo.TabStop = false; this.grpCompileInfo.Text = "Statistics"; - // + // // label12 - // + // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(16, 100); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(12, 81); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(51, 17); + this.label12.Size = new System.Drawing.Size(37, 13); this.label12.TabIndex = 19; this.label12.Text = "Errors:"; - // + // // lblParseErrorCount - // + // this.lblParseErrorCount.AutoSize = true; - this.lblParseErrorCount.Location = new System.Drawing.Point(144, 100); - this.lblParseErrorCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblParseErrorCount.Location = new System.Drawing.Point(108, 81); this.lblParseErrorCount.Name = "lblParseErrorCount"; - this.lblParseErrorCount.Size = new System.Drawing.Size(16, 17); + this.lblParseErrorCount.Size = new System.Drawing.Size(13, 13); this.lblParseErrorCount.TabIndex = 18; this.lblParseErrorCount.Text = "0"; - // + // // label1 - // + // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 73); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(12, 59); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(110, 17); + this.label1.Size = new System.Drawing.Size(82, 13); this.label1.TabIndex = 17; this.label1.Text = "Parse Time, ms:"; - // + // // lblParseTime - // + // this.lblParseTime.AutoSize = true; - this.lblParseTime.Location = new System.Drawing.Point(144, 73); - this.lblParseTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblParseTime.Location = new System.Drawing.Point(108, 59); this.lblParseTime.Name = "lblParseTime"; - this.lblParseTime.Size = new System.Drawing.Size(16, 17); + this.lblParseTime.Size = new System.Drawing.Size(13, 13); this.lblParseTime.TabIndex = 16; this.lblParseTime.Text = "0"; - // + // // label7 - // + // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(16, 20); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(12, 16); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(46, 17); + this.label7.Size = new System.Drawing.Size(35, 13); this.label7.TabIndex = 15; this.label7.Text = "Lines:"; - // + // // lblSrcLineCount - // + // this.lblSrcLineCount.AutoSize = true; - this.lblSrcLineCount.Location = new System.Drawing.Point(144, 20); - this.lblSrcLineCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblSrcLineCount.Location = new System.Drawing.Point(108, 16); this.lblSrcLineCount.Name = "lblSrcLineCount"; - this.lblSrcLineCount.Size = new System.Drawing.Size(16, 17); + this.lblSrcLineCount.Size = new System.Drawing.Size(13, 13); this.lblSrcLineCount.TabIndex = 14; this.lblSrcLineCount.Text = "0"; - // + // // label3 - // + // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(16, 46); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(12, 37); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(59, 17); + this.label3.Size = new System.Drawing.Size(46, 13); this.label3.TabIndex = 13; this.label3.Text = "Tokens:"; - // + // // lblSrcTokenCount - // + // this.lblSrcTokenCount.AutoSize = true; - this.lblSrcTokenCount.Location = new System.Drawing.Point(144, 46); - this.lblSrcTokenCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblSrcTokenCount.Location = new System.Drawing.Point(108, 37); this.lblSrcTokenCount.Name = "lblSrcTokenCount"; - this.lblSrcTokenCount.Size = new System.Drawing.Size(16, 17); + this.lblSrcTokenCount.Size = new System.Drawing.Size(13, 13); this.lblSrcTokenCount.TabIndex = 12; this.lblSrcTokenCount.Text = "0"; - // + // // pageParserTrace - // + // this.pageParserTrace.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pageParserTrace.Controls.Add(this.grpParserActions); this.pageParserTrace.Controls.Add(this.splitter1); this.pageParserTrace.Controls.Add(this.grpTokens); this.pageParserTrace.Controls.Add(this.pnlParserTraceTop); - this.pageParserTrace.Location = new System.Drawing.Point(4, 25); - this.pageParserTrace.Margin = new System.Windows.Forms.Padding(4); + this.pageParserTrace.Location = new System.Drawing.Point(4, 22); this.pageParserTrace.Name = "pageParserTrace"; - this.pageParserTrace.Padding = new System.Windows.Forms.Padding(4); - this.pageParserTrace.Size = new System.Drawing.Size(1464, 201); + this.pageParserTrace.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageParserTrace.Size = new System.Drawing.Size(1096, 161); this.pageParserTrace.TabIndex = 3; this.pageParserTrace.Text = "Parser Trace"; this.pageParserTrace.UseVisualStyleBackColor = true; - // + // // grpParserActions - // + // this.grpParserActions.Controls.Add(this.gridParserTrace); this.grpParserActions.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpParserActions.Location = new System.Drawing.Point(4, 34); - this.grpParserActions.Margin = new System.Windows.Forms.Padding(4); + this.grpParserActions.Location = new System.Drawing.Point(3, 28); this.grpParserActions.Name = "grpParserActions"; - this.grpParserActions.Padding = new System.Windows.Forms.Padding(4); - this.grpParserActions.Size = new System.Drawing.Size(1101, 161); + this.grpParserActions.Size = new System.Drawing.Size(823, 128); this.grpParserActions.TabIndex = 4; this.grpParserActions.TabStop = false; - // + // // gridParserTrace - // + // this.gridParserTrace.AllowUserToAddRows = false; this.gridParserTrace.AllowUserToDeleteRows = false; this.gridParserTrace.AllowUserToResizeRows = false; @@ -1049,23 +990,22 @@ private void InitializeComponent() { this.Input, this.Action}); this.gridParserTrace.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridParserTrace.Location = new System.Drawing.Point(4, 19); - this.gridParserTrace.Margin = new System.Windows.Forms.Padding(4); + this.gridParserTrace.Location = new System.Drawing.Point(3, 16); this.gridParserTrace.MultiSelect = false; this.gridParserTrace.Name = "gridParserTrace"; this.gridParserTrace.ReadOnly = true; this.gridParserTrace.RowHeadersVisible = false; this.gridParserTrace.RowTemplate.Height = 24; this.gridParserTrace.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.gridParserTrace.Size = new System.Drawing.Size(1093, 138); + this.gridParserTrace.Size = new System.Drawing.Size(817, 109); this.gridParserTrace.TabIndex = 0; this.gridParserTrace.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gridParserTrace_CellDoubleClick); - // + // // State - // + // this.State.DataPropertyName = "State"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.State.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.State.DefaultCellStyle = dataGridViewCellStyle23; this.State.HeaderText = "State"; this.State.Name = "State"; this.State.ReadOnly = true; @@ -1073,12 +1013,12 @@ private void InitializeComponent() { this.State.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.State.ToolTipText = "Double-click grid cell to navigate to state details"; this.State.Width = 60; - // + // // Stack - // + // this.Stack.DataPropertyName = "StackTop"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.Stack.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.Stack.DefaultCellStyle = dataGridViewCellStyle24; this.Stack.HeaderText = "Stack Top"; this.Stack.Name = "Stack"; this.Stack.ReadOnly = true; @@ -1086,9 +1026,9 @@ private void InitializeComponent() { this.Stack.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.Stack.ToolTipText = "Double-click grid cell to locate node in source code"; this.Stack.Width = 200; - // + // // Input - // + // this.Input.DataPropertyName = "Input"; this.Input.HeaderText = "Input"; this.Input.Name = "Input"; @@ -1096,121 +1036,112 @@ private void InitializeComponent() { this.Input.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.Input.ToolTipText = "Double-click grid cell to locate in source code"; this.Input.Width = 200; - // + // // Action - // + // this.Action.DataPropertyName = "Action"; this.Action.HeaderText = "Action"; this.Action.Name = "Action"; this.Action.ReadOnly = true; this.Action.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.Action.Width = 600; - // + // // splitter1 - // + // this.splitter1.BackColor = System.Drawing.SystemColors.Control; this.splitter1.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter1.Location = new System.Drawing.Point(1105, 34); - this.splitter1.Margin = new System.Windows.Forms.Padding(4); + this.splitter1.Location = new System.Drawing.Point(826, 28); this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(8, 161); + this.splitter1.Size = new System.Drawing.Size(6, 128); this.splitter1.TabIndex = 15; this.splitter1.TabStop = false; - // + // // grpTokens - // + // this.grpTokens.Controls.Add(this.lstTokens); this.grpTokens.Dock = System.Windows.Forms.DockStyle.Right; - this.grpTokens.Location = new System.Drawing.Point(1113, 34); - this.grpTokens.Margin = new System.Windows.Forms.Padding(4); + this.grpTokens.Location = new System.Drawing.Point(832, 28); this.grpTokens.Name = "grpTokens"; - this.grpTokens.Padding = new System.Windows.Forms.Padding(4); - this.grpTokens.Size = new System.Drawing.Size(345, 161); + this.grpTokens.Size = new System.Drawing.Size(259, 128); this.grpTokens.TabIndex = 3; this.grpTokens.TabStop = false; this.grpTokens.Text = "Tokens"; - // + // // lstTokens - // + // this.lstTokens.Dock = System.Windows.Forms.DockStyle.Fill; this.lstTokens.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lstTokens.FormattingEnabled = true; - this.lstTokens.ItemHeight = 17; - this.lstTokens.Location = new System.Drawing.Point(4, 19); - this.lstTokens.Margin = new System.Windows.Forms.Padding(4); + this.lstTokens.ItemHeight = 14; + this.lstTokens.Location = new System.Drawing.Point(3, 16); this.lstTokens.Name = "lstTokens"; - this.lstTokens.Size = new System.Drawing.Size(337, 138); + this.lstTokens.Size = new System.Drawing.Size(253, 109); this.lstTokens.TabIndex = 2; this.lstTokens.Click += new System.EventHandler(this.lstTokens_Click); - // + // // pnlParserTraceTop - // + // this.pnlParserTraceTop.BackColor = System.Drawing.SystemColors.Control; this.pnlParserTraceTop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pnlParserTraceTop.Controls.Add(this.chkExcludeComments); this.pnlParserTraceTop.Controls.Add(this.lblTraceComment); this.pnlParserTraceTop.Controls.Add(this.chkParserTrace); this.pnlParserTraceTop.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlParserTraceTop.Location = new System.Drawing.Point(4, 4); - this.pnlParserTraceTop.Margin = new System.Windows.Forms.Padding(4); + this.pnlParserTraceTop.Location = new System.Drawing.Point(3, 3); this.pnlParserTraceTop.Name = "pnlParserTraceTop"; - this.pnlParserTraceTop.Size = new System.Drawing.Size(1454, 30); + this.pnlParserTraceTop.Size = new System.Drawing.Size(1088, 25); this.pnlParserTraceTop.TabIndex = 1; - // + // // chkExcludeComments - // + // this.chkExcludeComments.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkExcludeComments.AutoSize = true; this.chkExcludeComments.Checked = true; this.chkExcludeComments.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkExcludeComments.Location = new System.Drawing.Point(1250, 4); - this.chkExcludeComments.Margin = new System.Windows.Forms.Padding(4); + this.chkExcludeComments.Location = new System.Drawing.Point(929, 3); this.chkExcludeComments.Name = "chkExcludeComments"; - this.chkExcludeComments.Size = new System.Drawing.Size(186, 21); + this.chkExcludeComments.Size = new System.Drawing.Size(145, 17); this.chkExcludeComments.TabIndex = 2; this.chkExcludeComments.Text = "Exclude comment tokens"; this.chkExcludeComments.UseVisualStyleBackColor = true; - // + // // lblTraceComment - // + // this.lblTraceComment.AutoSize = true; this.lblTraceComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblTraceComment.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.lblTraceComment.Location = new System.Drawing.Point(171, 4); - this.lblTraceComment.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblTraceComment.Location = new System.Drawing.Point(128, 3); this.lblTraceComment.Name = "lblTraceComment"; - this.lblTraceComment.Size = new System.Drawing.Size(470, 17); + this.lblTraceComment.Size = new System.Drawing.Size(350, 13); this.lblTraceComment.TabIndex = 1; this.lblTraceComment.Text = "(Double-click grid cell to navigate to parser state or source code position)"; - // + // // pageOutput - // + // this.pageOutput.Controls.Add(this.txtOutput); this.pageOutput.Controls.Add(this.pnlRuntimeInfo); - this.pageOutput.Location = new System.Drawing.Point(4, 25); - this.pageOutput.Margin = new System.Windows.Forms.Padding(4); + this.pageOutput.Location = new System.Drawing.Point(4, 22); this.pageOutput.Name = "pageOutput"; - this.pageOutput.Padding = new System.Windows.Forms.Padding(4); - this.pageOutput.Size = new System.Drawing.Size(1464, 201); + this.pageOutput.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3); + this.pageOutput.Size = new System.Drawing.Size(1096, 161); this.pageOutput.TabIndex = 0; this.pageOutput.Text = "Runtime Output"; this.pageOutput.UseVisualStyleBackColor = true; - // + // // txtOutput - // + // this.txtOutput.Dock = System.Windows.Forms.DockStyle.Fill; this.txtOutput.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtOutput.Location = new System.Drawing.Point(4, 4); - this.txtOutput.Margin = new System.Windows.Forms.Padding(4); + this.txtOutput.Location = new System.Drawing.Point(3, 3); this.txtOutput.Multiline = true; this.txtOutput.Name = "txtOutput"; this.txtOutput.ReadOnly = true; this.txtOutput.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtOutput.Size = new System.Drawing.Size(1255, 193); + this.txtOutput.Size = new System.Drawing.Size(939, 155); this.txtOutput.TabIndex = 1; - // + // // pnlRuntimeInfo - // + // this.pnlRuntimeInfo.Controls.Add(this.label14); this.pnlRuntimeInfo.Controls.Add(this.lblGCCount); this.pnlRuntimeInfo.Controls.Add(this.label13); @@ -1219,98 +1150,103 @@ private void InitializeComponent() { this.pnlRuntimeInfo.Controls.Add(this.label5); this.pnlRuntimeInfo.Controls.Add(this.lblRunTime); this.pnlRuntimeInfo.Dock = System.Windows.Forms.DockStyle.Right; - this.pnlRuntimeInfo.Location = new System.Drawing.Point(1259, 4); - this.pnlRuntimeInfo.Margin = new System.Windows.Forms.Padding(4); + this.pnlRuntimeInfo.Location = new System.Drawing.Point(942, 3); this.pnlRuntimeInfo.Name = "pnlRuntimeInfo"; - this.pnlRuntimeInfo.Size = new System.Drawing.Size(201, 193); + this.pnlRuntimeInfo.Size = new System.Drawing.Size(151, 155); this.pnlRuntimeInfo.TabIndex = 2; - // + // // label14 - // + // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(8, 28); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(6, 23); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(138, 17); + this.label14.Size = new System.Drawing.Size(105, 13); this.label14.TabIndex = 24; this.label14.Text = "GC Collection Count:"; - // + // // lblGCCount - // + // this.lblGCCount.AutoSize = true; - this.lblGCCount.Location = new System.Drawing.Point(165, 28); - this.lblGCCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblGCCount.Location = new System.Drawing.Point(124, 23); this.lblGCCount.Name = "lblGCCount"; - this.lblGCCount.Size = new System.Drawing.Size(16, 17); + this.lblGCCount.Size = new System.Drawing.Size(13, 13); this.lblGCCount.TabIndex = 23; this.lblGCCount.Text = "0"; - // + // // label13 - // + // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(7, 51); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Location = new System.Drawing.Point(5, 41); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(99, 17); + this.label13.Size = new System.Drawing.Size(73, 13); this.label13.TabIndex = 22; this.label13.Text = "Runtime error:"; - // + // // lnkShowErrStack - // + // this.lnkShowErrStack.AutoSize = true; this.lnkShowErrStack.Enabled = false; - this.lnkShowErrStack.Location = new System.Drawing.Point(31, 106); - this.lnkShowErrStack.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lnkShowErrStack.Location = new System.Drawing.Point(23, 86); this.lnkShowErrStack.Name = "lnkShowErrStack"; - this.lnkShowErrStack.Size = new System.Drawing.Size(101, 17); + this.lnkShowErrStack.Size = new System.Drawing.Size(79, 13); this.lnkShowErrStack.TabIndex = 21; this.lnkShowErrStack.TabStop = true; this.lnkShowErrStack.Text = "Show full stack"; this.lnkShowErrStack.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkShowErrStack_LinkClicked); - // + // // lnkShowErrLocation - // + // this.lnkShowErrLocation.AutoSize = true; this.lnkShowErrLocation.Enabled = false; - this.lnkShowErrLocation.Location = new System.Drawing.Point(31, 76); - this.lnkShowErrLocation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lnkShowErrLocation.Location = new System.Drawing.Point(23, 62); this.lnkShowErrLocation.Name = "lnkShowErrLocation"; - this.lnkShowErrLocation.Size = new System.Drawing.Size(130, 17); + this.lnkShowErrLocation.Size = new System.Drawing.Size(98, 13); this.lnkShowErrLocation.TabIndex = 20; this.lnkShowErrLocation.TabStop = true; this.lnkShowErrLocation.Text = "Show error location"; this.lnkShowErrLocation.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkShowErrLocation_LinkClicked); - // + // // label5 - // + // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(7, 4); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(5, 3); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(129, 17); + this.label5.Size = new System.Drawing.Size(98, 13); this.label5.TabIndex = 19; this.label5.Text = "Execution time, ms:"; - // + // // lblRunTime - // + // this.lblRunTime.AutoSize = true; - this.lblRunTime.Location = new System.Drawing.Point(164, 4); - this.lblRunTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblRunTime.Location = new System.Drawing.Point(123, 3); this.lblRunTime.Name = "lblRunTime"; - this.lblRunTime.Size = new System.Drawing.Size(16, 17); + this.lblRunTime.Size = new System.Drawing.Size(13, 13); this.lblRunTime.TabIndex = 18; this.lblRunTime.Text = "0"; - // + // + // btnRefresh + // + this.btnRefresh.Enabled = false; + this.btnRefresh.Location = new System.Drawing.Point(339, 2); + this.btnRefresh.Name = "btnRefresh"; + this.btnRefresh.Size = new System.Drawing.Size(56, 24); + this.btnRefresh.TabIndex = 14; + this.btnRefresh.Text = "Refresh"; + this.toolTip.SetToolTip(this.btnRefresh, "Reload grammar assembly and refresh the current grammar.\r\n" + + "Use Auto-refresh checkbox to do this automatically\r\nevery time the target assembly " + + "file is updated (recompiled)."); + this.btnRefresh.UseVisualStyleBackColor = true; + this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click); + // // fmGrammarExplorer - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1472, 844); + this.ClientSize = new System.Drawing.Size(1022, 603); this.Controls.Add(this.tabGrammar); this.Controls.Add(this.splitBottom); this.Controls.Add(this.pnlLang); this.Controls.Add(this.tabBottom); - this.Margin = new System.Windows.Forms.Padding(4); this.Name = "fmGrammarExplorer"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Irony Grammar Explorer"; @@ -1455,6 +1391,7 @@ private void InitializeComponent() { private System.Windows.Forms.DataGridViewTextBoxColumn Input; private System.Windows.Forms.DataGridViewTextBoxColumn Action; private System.Windows.Forms.Button btnLocate; + private System.Windows.Forms.Button btnRefresh; } } diff --git a/Irony.GrammarExplorer/fmGrammarExplorer.cs b/Irony.GrammarExplorer/fmGrammarExplorer.cs index eed4f98..9cb44f7 100644 --- a/Irony.GrammarExplorer/fmGrammarExplorer.cs +++ b/Irony.GrammarExplorer/fmGrammarExplorer.cs @@ -3,8 +3,8 @@ * Copyright (c) Roman Ivantsov * This source code is subject to terms and conditions of the MIT License * for Irony. A copy of the license can be found in the License.txt file - * at the root of this distribution. - * By using this source code in any fashion, you are agreeing to be bound by the terms of the + * at the root of this distribution. + * By using this source code in any fashion, you are agreeing to be bound by the terms of the * MIT License. * You must not remove this notice from this software. * **********************************************************************************/ @@ -38,7 +38,7 @@ public fmGrammarExplorer() { //fields Grammar _grammar; - LanguageData _language; + LanguageData _language; Parser _parser; ParseTree _parseTree; ScriptException _runtimeError; @@ -70,10 +70,10 @@ private void fmExploreGrammar_FormClosing(object sender, FormClosingEventArgs e) Settings.Default.DisableHili = chkDisableHili.Checked; Settings.Default.AutoRefresh = chkAutoRefresh.Checked; var grammars = GrammarItemList.FromCombo(cboGrammars); - Settings.Default.Grammars = grammars.ToXml(); + Settings.Default.Grammars = grammars.ToXml(); Settings.Default.Save(); }//method - #endregion + #endregion #region Show... methods //Show... methods ###################################################################################################################### @@ -95,7 +95,7 @@ private void ClearParserOutput() { gridParserTrace.Rows.Clear(); lstTokens.Items.Clear(); tvParseTree.Nodes.Clear(); - tvAst.Nodes.Clear(); + tvAst.Nodes.Clear(); Application.DoEvents(); } @@ -111,10 +111,10 @@ private void ShowLanguageInfo() { private void ShowCompilerErrors() { gridCompileErrors.Rows.Clear(); - if (_parseTree == null || _parseTree.ParserMessages.Count == 0) return; - foreach (var err in _parseTree.ParserMessages) + if (_parseTree == null || _parseTree.ParserMessages.Count == 0) return; + foreach (var err in _parseTree.ParserMessages) gridCompileErrors.Rows.Add(err.Location, err, err.ParserState); - var needPageSwitch = tabBottom.SelectedTab != pageParserOutput && + var needPageSwitch = tabBottom.SelectedTab != pageParserOutput && !(tabBottom.SelectedTab == pageParserTrace && chkParserTrace.Checked); if (needPageSwitch) tabBottom.SelectedTab = pageParserOutput; @@ -123,13 +123,13 @@ private void ShowCompilerErrors() { private void ShowParseTrace() { gridParserTrace.Rows.Clear(); foreach (var entry in _parser.Context.ParserTrace) { - int index = gridParserTrace.Rows.Add(entry.State, entry.StackTop, entry.Input, entry.Message); + int index = gridParserTrace.Rows.Add(entry.State, entry.StackTop, entry.Input, entry.Message); if (entry.IsError) gridParserTrace.Rows[gridParserTrace.Rows.Count - 1].DefaultCellStyle.ForeColor = Color.Red; } //Show tokens foreach (Token tkn in _parseTree.Tokens) { - if (chkExcludeComments.Checked && tkn.Category == TokenCategory.Comment) continue; + if (chkExcludeComments.Checked && tkn.Category == TokenCategory.Comment) continue; lstTokens.Items.Add(tkn); } }//method @@ -143,19 +143,19 @@ private void ShowCompileStats() { lblParseTime.Text = _parseTree.ParseTimeMilliseconds.ToString(); lblParseErrorCount.Text = _parseTree.ParserMessages.Count.ToString(); Application.DoEvents(); - //Note: this time is "pure" parse time; actual delay after cliking "Compile" includes time to fill ParseTree, AstTree controls + //Note: this time is "pure" parse time; actual delay after cliking "Compile" includes time to fill ParseTree, AstTree controls } private void ShowParseTree() { tvParseTree.Nodes.Clear(); - if (_parseTree == null) return; + if (_parseTree == null) return; AddParseNodeRec(null, _parseTree.Root); } private void AddParseNodeRec(TreeNode parent, ParseTreeNode node) { if (node == null) return; string txt = node.ToString(); TreeNode tvNode = (parent == null? tvParseTree.Nodes.Add(txt) : parent.Nodes.Add(txt) ); - tvNode.Tag = node; + tvNode.Tag = node; foreach(var child in node.ChildNodes) AddParseNodeRec(tvNode, child); } @@ -167,20 +167,20 @@ private void ShowAstTree() { } private void AddAstNodeRec(TreeNode parent, object astNode) { - if (astNode == null) return; + if (astNode == null) return; string txt = astNode.ToString(); TreeNode newNode = (parent == null ? tvAst.Nodes.Add(txt) : parent.Nodes.Add(txt)); newNode.Tag = astNode; var iBrowsable = astNode as IBrowsableAstNode; if (iBrowsable == null) return; - var childList = iBrowsable.GetChildNodes(); + var childList = iBrowsable.GetChildNodes(); foreach (var child in childList) AddAstNodeRec(newNode, child); } private void ShowParserConstructionResults() { - lblParserStateCount.Text = _language.ParserData.States.Count.ToString(); + lblParserStateCount.Text = _language.ParserData.States.Count.ToString(); lblParserConstrTime.Text = _language.ConstructionTime.ToString(); txtParserStates.Text = string.Empty; gridGrammarErrors.Rows.Clear(); @@ -188,7 +188,7 @@ private void ShowParserConstructionResults() { txtNonTerms.Text = string.Empty; txtParserStates.Text = string.Empty; tabBottom.SelectedTab = pageLanguage; - if (_parser == null) return; + if (_parser == null) return; txtTerms.Text = ParserDataPrinter.PrintTerminals(_language); txtNonTerms.Text = ParserDataPrinter.PrintNonTerminals(_language); txtParserStates.Text = ParserDataPrinter.PrintStateList(_language); @@ -240,18 +240,18 @@ private void LocateParserState(ParserState state) { private void ShowRuntimeError(ScriptException error){ _runtimeError = error; lnkShowErrLocation.Enabled = _runtimeError != null; - lnkShowErrStack.Enabled = lnkShowErrLocation.Enabled; + lnkShowErrStack.Enabled = lnkShowErrLocation.Enabled; if (_runtimeError != null) { //the exception was caught and processed by Interpreter WriteOutput("Error: " + error.Message + " At " + _runtimeError.Location.ToUiString() + "."); - ShowSourcePosition(_runtimeError.Location.Position, 1); + ShowSourcePosition(_runtimeError.Location.Position, 1); } else { //the exception was not caught by interpreter/AST node. Show full exception info WriteOutput("Error: " + error.Message); fmShowException.ShowException(error); } - tabBottom.SelectedTab = pageOutput; + tabBottom.SelectedTab = pageOutput; } private void SelectTreeNode(TreeView tree, TreeNode node) { @@ -266,12 +266,12 @@ private void SelectTreeNode(TreeView tree, TreeNode node) { private void ClearRuntimeInfo() { lnkShowErrLocation.Enabled = false; - lnkShowErrStack.Enabled = false; + lnkShowErrStack.Enabled = false; _runtimeError = null; txtOutput.Text = string.Empty; } - #endregion + #endregion #region Grammar combo menu commands private void menuGrammars_Opening(object sender, CancelEventArgs e) { @@ -281,14 +281,15 @@ private void menuGrammars_Opening(object sender, CancelEventArgs e) { private void miAdd_Click(object sender, EventArgs e) { if (dlgSelectAssembly.ShowDialog() != DialogResult.OK) return; string location = dlgSelectAssembly.FileName; - if (string.IsNullOrEmpty(location)) return; - var oldGrammars = new GrammarItemList(); + if (string.IsNullOrEmpty(location)) return; + var oldGrammars = new GrammarItemList(); foreach(var item in cboGrammars.Items) oldGrammars.Add((GrammarItem) item); var grammars = fmSelectGrammars.SelectGrammars(location, oldGrammars); if (grammars == null) return; foreach (GrammarItem item in grammars) cboGrammars.Items.Add(item); + btnRefresh.Enabled = false; // auto-select the first grammar if no grammar currently selected if (cboGrammars.SelectedIndex < 0 && grammars.Count > 0) cboGrammars.SelectedIndex = 0; @@ -301,6 +302,8 @@ private void miRemove_Click(object sender, EventArgs e) { _parser = null; if (cboGrammars.Items.Count > 0) cboGrammars.SelectedIndex = 0; + else + btnRefresh.Enabled = false; } } @@ -308,6 +311,7 @@ private void miRemoveAll_Click(object sender, EventArgs e) { if (MessageBox.Show("Are you sure you want to remove all grammmars in the list?", "Confirm", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) { cboGrammars.Items.Clear(); + btnRefresh.Enabled = false; _parser = null; } } @@ -324,8 +328,8 @@ private void CreateParser() { txtOutput.Text = string.Empty; _parseTree = null; - btnRun.Enabled = _grammar is ICanRunSample; - _language = new LanguageData(_grammar); + btnRun.Enabled = _grammar is ICanRunSample; + _language = new LanguageData(_grammar); _parser = new Parser (_language); ShowParserConstructionResults(); StartHighlighter(); @@ -333,7 +337,7 @@ private void CreateParser() { private void ParseSample() { ClearParserOutput(); - if (_parser == null || !_parser.Language.CanParse()) return; + if (_parser == null || !_parser.Language.CanParse()) return; _parseTree = null; GC.Collect(); //to avoid disruption of perf times with occasional collections _parser.Context.TracingEnabled = chkParserTrace.Checked; @@ -351,7 +355,7 @@ private void ParseSample() { } ShowCompileStats(); ShowParseTree(); - ShowAstTree(); + ShowAstTree(); } } @@ -366,28 +370,28 @@ private void RunSample() { if (_parseTree.ParserMessages.Count > 0) return; GC.Collect(); //to avoid disruption of perf times with occasional collections - oldGcCount = GC.CollectionCount(0); + oldGcCount = GC.CollectionCount(0); System.Threading.Thread.Sleep(100); - sw.Start(); + sw.Start(); var iRunner = _grammar as ICanRunSample; - var args = new RunSampleArgs(_language, txtSource.Text, _parseTree); - string output = iRunner.RunSample(args); + var args = new RunSampleArgs(_language, txtSource.Text, _parseTree); + string output = iRunner.RunSample(args); sw.Stop(); lblRunTime.Text = sw.ElapsedMilliseconds.ToString(); var gcCount = GC.CollectionCount(0) - oldGcCount; - lblGCCount.Text = gcCount.ToString(); + lblGCCount.Text = gcCount.ToString(); WriteOutput(output); tabBottom.SelectedTab = pageOutput; } catch (ScriptException ex) { - ShowRuntimeError(ex); + ShowRuntimeError(ex); } finally { sw.Stop(); }//finally }//method private void WriteOutput(string text) { - if (string.IsNullOrEmpty(text)) return; + if (string.IsNullOrEmpty(text)) return; txtOutput.Text += text + Environment.NewLine; txtOutput.Select(txtOutput.Text.Length - 1, 0); } @@ -403,7 +407,7 @@ private void LoadSourceFile(string path) { txtSource.Text = null; //to clear any old formatting txtSource.Text = reader.ReadToEnd(); txtSource.Select(0, 0); - + } catch (Exception e) { MessageBox.Show(e.Message); } finally { @@ -412,13 +416,13 @@ private void LoadSourceFile(string path) { } } - //Source highlighting + //Source highlighting RichTextBoxHighlighter _highlighter; private void StartHighlighter() { if (_highlighter != null) StopHighlighter(); - if (chkDisableHili.Checked) return; - if (!_parser.Language.CanParse()) return; + if (chkDisableHili.Checked) return; + if (!_parser.Language.CanParse()) return; _highlighter = new RichTextBoxHighlighter(txtSource, _language); _highlighter.Adapter.Activate(); } @@ -426,18 +430,18 @@ private void StopHighlighter() { if (_highlighter == null) return; _highlighter.Dispose(); _highlighter = null; - ClearHighlighting(); + ClearHighlighting(); } private void ClearHighlighting() { var txt = txtSource.Text; - txtSource.Clear(); + txtSource.Clear(); txtSource.Text = txt; //remove all old highlighting } private void EnableHighlighter(bool enable) { if (_highlighter != null) StopHighlighter(); if (enable) - StartHighlighter(); + StartHighlighter(); } //The following methods are contributed by Andrew Bradnan; pasted here with minor changes @@ -500,8 +504,8 @@ private void btnRun_Click(object sender, EventArgs e) { } private void tvParseTree_AfterSelect(object sender, TreeViewEventArgs e) { - if (_treeClickDisabled) - return; + if (_treeClickDisabled) + return; var vtreeNode = tvParseTree.SelectedNode; if (vtreeNode == null) return; var parseNode = vtreeNode.Tag as ParseTreeNode; @@ -524,7 +528,7 @@ private void LoadSelectedGrammar() { try { ClearLanguageInfo(); ClearParserOutput(); - ClearRuntimeInfo(); + ClearRuntimeInfo(); _changingGrammar = true; CreateGrammar(); @@ -533,6 +537,7 @@ private void LoadSelectedGrammar() { } finally { _changingGrammar = false; //in case of exception } + btnRefresh.Enabled = true; } private void cboGrammars_SelectedIndexChanged(object sender, EventArgs e) { @@ -551,6 +556,10 @@ private void GrammarAssemblyUpdated(object sender, EventArgs args) { } } + private void btnRefresh_Click(object sender, EventArgs e) { + LoadSelectedGrammar(); + } + private void btnFileOpen_Click(object sender, EventArgs e) { if (dlgOpenFile.ShowDialog() != DialogResult.OK) return; ClearParserOutput(); @@ -568,7 +577,7 @@ private void btnManageGrammars_Click(object sender, EventArgs e) { private void cboParseMethod_SelectedIndexChanged(object sender, EventArgs e) { //changing grammar causes setting of parse method combo, so to prevent double-call to ConstructParser // we don't do it here if _changingGrammar is set - if (!_changingGrammar) + if (!_changingGrammar) CreateParser(); } @@ -631,7 +640,7 @@ private void txtSearch_KeyPress(object sender, KeyPressEventArgs e) { private void lnkShowErrLocation_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { if (_runtimeError != null) - ShowSourcePosition(_runtimeError.Location.Position, 1); + ShowSourcePosition(_runtimeError.Location.Position, 1); } private void lnkShowErrStack_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { @@ -639,7 +648,7 @@ private void lnkShowErrStack_LinkClicked(object sender, LinkLabelLinkClickedEven if (_runtimeError.InnerException != null) fmShowException.ShowException(_runtimeError.InnerException); else - fmShowException.ShowException(_runtimeError); + fmShowException.ShowException(_runtimeError); } private void btnLocate_Click(object sender, EventArgs e) { @@ -647,7 +656,7 @@ private void btnLocate_Click(object sender, EventArgs e) { ParseSample(); var p = txtSource.SelectionStart; tvParseTree.SelectedNode = null; //just in case we won't find - tvAst.SelectedNode = null; + tvAst.SelectedNode = null; SelectTreeNode(tvParseTree, LocateTreeNode(tvParseTree.Nodes, p, node => (node.Tag as ParseTreeNode).Span.Location.Position)); SelectTreeNode(tvAst, LocateTreeNode(tvAst.Nodes, p, node => (node.Tag as IBrowsableAstNode).Position)); txtSource.Focus(); //set focus back to source @@ -655,14 +664,14 @@ private void btnLocate_Click(object sender, EventArgs e) { private TreeNode LocateTreeNode(TreeNodeCollection nodes, int position, Func positionFunction) { TreeNode current = null; - //Find the last node in the list that is "before or at" the position + //Find the last node in the list that is "before or at" the position foreach (TreeNode node in nodes) { if (positionFunction(node) > position) break; //from loop current = node; } //if current has children, search them - if (current != null && current.Nodes.Count > 0) - current = LocateTreeNode(current.Nodes, position, positionFunction) ?? current; + if (current != null && current.Nodes.Count > 0) + current = LocateTreeNode(current.Nodes, position, positionFunction) ?? current; return current; } diff --git a/Irony.GrammarExplorer/fmGrammarExplorer.resx b/Irony.GrammarExplorer/fmGrammarExplorer.resx index 8b472b6..97c38da 100644 --- a/Irony.GrammarExplorer/fmGrammarExplorer.resx +++ b/Irony.GrammarExplorer/fmGrammarExplorer.resx @@ -120,6 +120,9 @@ 454, 17 + + 454, 17 + If you check this box, the Grammar Explorer will automatically reload the grammar definition from the containing assembly whenever the target assembly is updated (recompiled). @@ -145,6 +148,15 @@ Simply restart the Grammar Explorer to clean-up the memory. True + + True + + + True + + + True + True @@ -154,6 +166,27 @@ Simply restart the Grammar Explorer to clean-up the memory. True + + True + + + True + + + True + + + True + + + True + + + True + + + True + True