From 9f2ad7e2fb6645f101f97f61871d66a7a05cdf36 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 26 Apr 2007 15:37:06 +0000 Subject: [PATCH] *** empty log message *** --- ase/ase.sln | 25 ++++++++++++++++++++----- ase/test/awk/awk.c | 4 ++-- ase/test/cnt/AwkForm.Designer.cs | 2 +- ase/test/cnt/AwkForm.cs | 2 +- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ase/ase.sln b/ase/ase.sln index 17ad571c..5f82fa42 100644 --- a/ase/ase.sln +++ b/ase/ase.sln @@ -12,20 +12,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aseawk", "awk\aseawk.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aesawk_jni", "awk\aseawk_jni.vcproj", "{23B58791-FD44-4F95-9F77-34E4AF45A296}" ProjectSection(ProjectDependencies) = postProject - {17621C83-40C9-4305-BAF9-132E250B5FE3} = {17621C83-40C9-4305-BAF9-132E250B5FE3} {5F2E77D5-1485-48D1-9371-987BC55FEE83} = {5F2E77D5-1485-48D1-9371-987BC55FEE83} + {17621C83-40C9-4305-BAF9-132E250B5FE3} = {17621C83-40C9-4305-BAF9-132E250B5FE3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asecom", "com\asecom.vcproj", "{963AF7B5-12E6-42B6-8CBE-89136C1A109B}" ProjectSection(ProjectDependencies) = postProject - {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} {5F2E77D5-1485-48D1-9371-987BC55FEE83} = {5F2E77D5-1485-48D1-9371-987BC55FEE83} + {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asetestawk", "test\awk\asetestawk.vcproj", "{57F1E1D0-28B6-42BF-BAFB-045AEE2DCF4F}" ProjectSection(ProjectDependencies) = postProject - {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} {5F2E77D5-1485-48D1-9371-987BC55FEE83} = {5F2E77D5-1485-48D1-9371-987BC55FEE83} + {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aselsp", "lsp\aselsp.vcproj", "{42FE7CED-34B7-45C8-92C9-8856E16640D2}" @@ -35,14 +35,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aselsp", "lsp\aselsp.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asetestlsp", "test\lsp\asetestlsp.vcproj", "{868702B0-CB6B-4F1D-B98A-32193347EFAF}" ProjectSection(ProjectDependencies) = postProject - {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} {42FE7CED-34B7-45C8-92C9-8856E16640D2} = {42FE7CED-34B7-45C8-92C9-8856E16640D2} + {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} = {C3EBBFAE-9D08-4FA2-8B0E-D09BEBF84EDD} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asetestcom", "test\com\asetestcom.csproj", "{F14B75D8-3ED7-4621-B5B9-E96A80B5D809}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asetestcnt", "test\com\asetestcnt.csproj", "{F14B75D8-3ED7-4621-B5B9-E96A80B5D809}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asenet", "net\asenet.vcproj", "{4CBF0E86-D018-49D7-A6B8-0CDA698203F7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asecnt", "cnt\asecnt.csproj", "{7F679165-41FB-4E1E-B3F5-23C5EE94166A}" + ProjectSection(ProjectDependencies) = postProject + {963AF7B5-12E6-42B6-8CBE-89136C1A109B} = {963AF7B5-12E6-42B6-8CBE-89136C1A109B} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -153,6 +158,16 @@ Global {4CBF0E86-D018-49D7-A6B8-0CDA698203F7}.Release|Mixed Platforms.Build.0 = Release|Win32 {4CBF0E86-D018-49D7-A6B8-0CDA698203F7}.Release|Win32.ActiveCfg = Release|Win32 {4CBF0E86-D018-49D7-A6B8-0CDA698203F7}.Release|Win32.Build.0 = Release|Win32 + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Debug|Win32.ActiveCfg = Debug|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Release|Any CPU.Build.0 = Release|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7F679165-41FB-4E1E-B3F5-23C5EE94166A}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index 6e1a6162..dc189bbf 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c,v 1.193 2007-04-15 15:26:58 bacon Exp $ + * $Id: awk.c,v 1.194 2007-04-26 15:34:19 bacon Exp $ */ #include @@ -713,7 +713,7 @@ static void on_run_start (ase_awk_run_t* run, void* custom) static int print_awk_value (ase_awk_pair_t* pair, void* arg) { ase_awk_run_t* run = (ase_awk_run_t*)arg; - dprintf (ASE_T("%s = "), (const ase_char_t*)pair->key); + dprintf (ASE_T("%.*s = "), pair->key.len, pair->key.ptr); ase_awk_dprintval (run, (ase_awk_val_t*)pair->val); dprintf (ASE_T("\n")); return 0; diff --git a/ase/test/cnt/AwkForm.Designer.cs b/ase/test/cnt/AwkForm.Designer.cs index c1a2e4e8..004326a3 100644 --- a/ase/test/cnt/AwkForm.Designer.cs +++ b/ase/test/cnt/AwkForm.Designer.cs @@ -331,7 +331,7 @@ namespace ASETestCom this.Controls.Add(this.panel2); this.Controls.Add(this.statusStrip1); this.Name = "AwkForm"; - this.Text = "ASE.COM.NET.AWK"; + this.Text = "ASE.CNT.AWK"; this.tableLayoutPanel1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); diff --git a/ase/test/cnt/AwkForm.cs b/ase/test/cnt/AwkForm.cs index e21062fb..dbace129 100644 --- a/ase/test/cnt/AwkForm.cs +++ b/ase/test/cnt/AwkForm.cs @@ -18,7 +18,7 @@ namespace ASETestCom private void btnRun_Click(object sender, EventArgs e) { - Awk awk = new StdAwk (); + ASECNT.Awk awk = new ASECNT.StdAwk (); //System.Text.Encoding.Default awk.SourceInputStream = new MemoryStream (UnicodeEncoding.UTF8.GetBytes(tbxSourceInput.Text));