OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja
  • R/O
  • SSH
  • HTTPS

cadencii: コミット


コミットメタ情報

リビジョン1765 (tree)
日時2011-11-11 02:39:05
作者kbinani

ログメッセージ

[luavsq] BPListの検索結果を格納するデータオブジェクトを移植; テストで読み込むファイルをluavsq.luaに変更

変更サマリ

差分

--- luavsq/trunk/test/PhoneticSymbolTest.lua (revision 1764)
+++ luavsq/trunk/test/PhoneticSymbolTest.lua (revision 1765)
@@ -1,6 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../PhoneticSymbol.lua" );
1+dofile( "./test_bootstrap.lua" );
42 module( "enhanced", package.seeall, lunit.testcase );
53
64 function testIsConsonant()
--- luavsq/trunk/test/TextStreamTest.lua (revision 1764)
+++ luavsq/trunk/test/TextStreamTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../TextStream.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testConstruct()
--- luavsq/trunk/test/TimesigTest.lua (revision 1764)
+++ luavsq/trunk/test/TimesigTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../Timesig.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testConstructor()
--- luavsq/trunk/test/BPTest.lua (revision 1764)
+++ luavsq/trunk/test/BPTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../BP.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testConstruct()
--- luavsq/trunk/test/NoteHeadHandleTest.lua (revision 1764)
+++ luavsq/trunk/test/NoteHeadHandleTest.lua (revision 1765)
@@ -1,10 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../ArticulationType.lua" );
4-dofile( "../NoteHeadHandle.lua" );
5-dofile( "../IconParameter.lua" );
6-dofile( "../Handle.lua" );
7-dofile( "../HandleType.lua" );
1+dofile( "./test_bootstrap.lua" );
82 module( "enhanced", package.seeall, lunit.testcase );
93
104 function testConstruct()
--- luavsq/trunk/test/IconHandleTest.lua (revision 1764)
+++ luavsq/trunk/test/IconHandleTest.lua (revision 1765)
@@ -1,7 +1,4 @@
1-require( "lunit" );
2-dofile( "../IconHandle.lua" );
3-dofile( "../Handle.lua" );
4-dofile( "../HandleType.lua" );
1+dofile( "./test_bootstrap.lua" );
52 module( "enhanced", package.seeall, lunit.testcase );
63
74 function getIconHandle()
--- luavsq/trunk/test/PlayModeTest.lua (revision 1764)
+++ luavsq/trunk/test/PlayModeTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../PlayMode.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function test()
--- luavsq/trunk/test/test_bootstrap.lua (nonexistent)
+++ luavsq/trunk/test/test_bootstrap.lua (revision 1765)
@@ -0,0 +1,3 @@
1+require( "lunit" );
2+os.execute( "cd ../tool && make > /dev/null" );
3+dofile( "../tool/luavsq.lua" );
--- luavsq/trunk/test/DynamicsModeTest.lua (revision 1764)
+++ luavsq/trunk/test/DynamicsModeTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../DynamicsMode.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function test()
--- luavsq/trunk/test/UtilTest.lua (revision 1764)
+++ luavsq/trunk/test/UtilTest.lua (revision 1765)
@@ -1,6 +1,5 @@
1-require( "lunit" )
2-dofile( "../Util.lua" )
3-module( "enhanced", package.seeall, lunit.testcase )
1+dofile( "./test_bootstrap.lua" );
2+module( "enhanced", package.seeall, lunit.testcase );
43
54 function testSplit()
65 local value = "\t\tfoo\t\tbar"
--- luavsq/trunk/test/EventListTest.lua (revision 1764)
+++ luavsq/trunk/test/EventListTest.lua (revision 1765)
@@ -1,8 +1,4 @@
1-require( "lunit" );
2-dofile( "../EventList.lua" );
3-dofile( "../Event.lua" );
4-dofile( "../ID.lua" );
5-dofile( "../IDType.lua" );
1+dofile( "./test_bootstrap.lua" );
62 module( "enhanced", package.seeall, lunit.testcase );
73
84 function testConstruct()
--- luavsq/trunk/test/NRPNTest.lua (revision 1764)
+++ luavsq/trunk/test/NRPNTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../NRPN.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testGetVoiceChangeParameterID()
--- luavsq/trunk/test/TempoTableEntryTest.lua (revision 1764)
+++ luavsq/trunk/test/TempoTableEntryTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../TempoTableEntry.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testConstructor()
--- luavsq/trunk/test/EventTest.lua (revision 1764)
+++ luavsq/trunk/test/EventTest.lua (revision 1765)
@@ -1,17 +1,4 @@
1-require( "lunit" );
2-dofile( "../Event.lua" );
3-dofile( "../IDType.lua" );
4-dofile( "../ID.lua" );
5-dofile( "../Util.lua" );
6-dofile( "../TextStream.lua" );
7-dofile( "../LyricHandle.lua" );
8-dofile( "../ArticulationType.lua" );
9-dofile( "../Lyric.lua" );
10-dofile( "../VibratoHandle.lua" );
11-dofile( "../IconParameter.lua" );
12-dofile( "../VibratoBPList.lua" );
13-dofile( "../NoteHeadHandle.lua" );
14-dofile( "../IconHandle.lua" );
1+dofile( "./test_bootstrap.lua" );
152 module( "enhanced", package.seeall, lunit.testcase );
163
174 function getNoteID()
--- luavsq/trunk/test/VibratoHandleTest.lua (revision 1764)
+++ luavsq/trunk/test/VibratoHandleTest.lua (revision 1765)
@@ -1,12 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../ArticulationType.lua" );
4-dofile( "../IconParameter.lua" );
5-dofile( "../VibratoBP.lua" );
6-dofile( "../VibratoBPList.lua" );
7-dofile( "../VibratoHandle.lua" );
8-dofile( "../Handle.lua" );
9-dofile( "../HandleType.lua" );
1+dofile( "./test_bootstrap.lua" );
102 module( "enhanced", package.seeall, lunit.testcase );
113
124 function testToString()
--- luavsq/trunk/test/LyricTest.lua (revision 1764)
+++ luavsq/trunk/test/LyricTest.lua (revision 1765)
@@ -1,7 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../PhoneticSymbol.lua" );
4-dofile( "../Lyric.lua" );
1+dofile( "./test_bootstrap.lua" );
52 module( "enhanced", package.seeall, lunit.testcase );
63
74 function testConstructWithLine()
--- luavsq/trunk/test/BPListSearchResultTest.lua (nonexistent)
+++ luavsq/trunk/test/BPListSearchResultTest.lua (revision 1765)
@@ -0,0 +1,9 @@
1+dofile( "./test_bootstrap.lua" );
2+module( "enhanced", package.seeall, lunit.testcase );
3+
4+function testConstruct()
5+ local result = luavsq.BPListSearchResult.new();
6+ assert_equal( 0, result.clock );
7+ assert_equal( 0, result.index );
8+ assert_not_nil( result.point );
9+end
--- luavsq/trunk/test/VibratoBPListTest.lua (revision 1764)
+++ luavsq/trunk/test/VibratoBPListTest.lua (revision 1765)
@@ -1,7 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../VibratoBP.lua" );
4-dofile( "../VibratoBPList.lua" );
1+dofile( "./test_bootstrap.lua" );
52 module( "enhanced", package.seeall, lunit.testcase );
63
74 function testConstructWithString()
--- luavsq/trunk/test/CommonTest.lua (revision 1764)
+++ luavsq/trunk/test/CommonTest.lua (revision 1765)
@@ -1,9 +1,4 @@
1-require( "lunit" );
2-dofile( "../Common.lua" );
3-dofile( "../TextStream.lua" );
4-dofile( "../DynamicsMode.lua" );
5-dofile( "../PlayMode.lua" );
6-dofile( "../Util.lua" );
1+dofile( "./test_bootstrap.lua" );
72 module( "enhanced", package.seeall, lunit.testcase );
83
94 function testConstructFromStream()
--- luavsq/trunk/test/VibratoBPTest.lua (revision 1764)
+++ luavsq/trunk/test/VibratoBPTest.lua (revision 1765)
@@ -1,6 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../VibratoBP.lua" );
1+dofile( "./test_bootstrap.lua" );
42 module( "enhanced", package.seeall, lunit.testcase );
53
64 function testConstruct()
--- luavsq/trunk/test/HandleTest.lua (revision 1764)
+++ luavsq/trunk/test/HandleTest.lua (revision 1765)
@@ -1,18 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../Handle.lua" );
4-dofile( "../TextStream.lua" );
5-dofile( "../HandleType.lua" );
6-dofile( "../Lyric.lua" );
7-dofile( "../VibratoBPList.lua" );
8-dofile( "../VibratoBP.lua" );
9-dofile( "../LyricHandle.lua" );
10-dofile( "../ArticulationType.lua" );
11-dofile( "../VibratoHandle.lua" );
12-dofile( "../IconParameter.lua" );
13-dofile( "../IconHandle.lua" );
14-dofile( "../NoteHeadHandle.lua" );
15-dofile( "../IconDynamicsHandle.lua" );
1+dofile( "./test_bootstrap.lua" );
162 module( "enhanced", package.seeall, lunit.testcase );
173
184 function getLyricStream()
--- luavsq/trunk/test/TimesigTableEntryTest.lua (revision 1764)
+++ luavsq/trunk/test/TimesigTableEntryTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../TimesigTableEntry.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testConstruct()
--- luavsq/trunk/test/IconDynamicsHandleTest.lua (revision 1764)
+++ luavsq/trunk/test/IconDynamicsHandleTest.lua (revision 1765)
@@ -1,12 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../Handle.lua" );
4-dofile( "../IconDynamicsHandle.lua" );
5-dofile( "../ArticulationType.lua" );
6-dofile( "../IconParameter.lua" );
7-dofile( "../VibratoBPList.lua" );
8-dofile( "../VibratoBP.lua" );
9-dofile( "../HandleType.lua" );
1+dofile( "./test_bootstrap.lua" );
102 module( "enhanced", package.seeall, lunit.testcase );
113
124 function testConstruct()
--- luavsq/trunk/test/IDTest.lua (revision 1764)
+++ luavsq/trunk/test/IDTest.lua (revision 1765)
@@ -1,16 +1,4 @@
1-require( "lunit" );
2-dofile( "../IDType.lua" );
3-dofile( "../ID.lua" );
4-dofile( "../IconHandle.lua" );
5-dofile( "../LyricHandle.lua" );
6-dofile( "../ArticulationType.lua" );
7-dofile( "../Lyric.lua" );
8-dofile( "../VibratoHandle.lua" );
9-dofile( "../IconParameter.lua" );
10-dofile( "../VibratoBPList.lua" );
11-dofile( "../NoteHeadHandle.lua" );
12-dofile( "../IconDynamicsHandle.lua" );
13-dofile( "../Util.lua" );
1+dofile( "./test_bootstrap.lua" );
142 module( "enhanced", package.seeall, lunit.testcase );
153
164 function testConstructWithValue()
--- luavsq/trunk/test/LyricHandleTest.lua (revision 1764)
+++ luavsq/trunk/test/LyricHandleTest.lua (revision 1765)
@@ -1,11 +1,4 @@
1-require( "lunit" );
2-dofile( "../Util.lua" );
3-dofile( "../HandleType.lua" );
4-dofile( "../Handle.lua" );
5-dofile( "../ArticulationType.lua" );
6-dofile( "../Lyric.lua" );
7-dofile( "../LyricHandle.lua" );
8-dofile( "../PhoneticSymbol.lua" );
1+dofile( "./test_bootstrap.lua" );
92 module( "enhanced", package.seeall, lunit.testcase );
103
114 function testConstruct()
--- luavsq/trunk/test/IDTypeTest.lua (revision 1764)
+++ luavsq/trunk/test/IDTypeTest.lua (revision 1765)
@@ -1,5 +1,4 @@
1-require( "lunit" );
2-dofile( "../IDType.lua" );
1+dofile( "./test_bootstrap.lua" );
32 module( "enhanced", package.seeall, lunit.testcase );
43
54 function testToString()
--- luavsq/trunk/BP.lua (revision 1764)
+++ luavsq/trunk/BP.lua (revision 1765)
@@ -28,7 +28,7 @@
2828 ---
2929 -- @return [object]
3030 function this:clone()
31- return luavsq.BP( self.value, self.id );
31+ return luavsq.BP.new( self.value, self.id );
3232 end
3333
3434 return this;
--- luavsq/trunk/BPListSearchResult.lua (nonexistent)
+++ luavsq/trunk/BPListSearchResult.lua (revision 1765)
@@ -0,0 +1,31 @@
1+--[[
2+ BPListSearchResult.lua
3+ Copyright © 2011 kbinani
4+
5+ This file is part of luavsq.
6+
7+ luavsq is free software; you can redistribute it and/or
8+ modify it under the terms of the BSD License.
9+
10+ luavsq is distributed in the hope that it will be useful,
11+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13+]]
14+
15+if( nil == luavsq )then
16+ luavsq = {};
17+end
18+
19+if( nil == luavsq.BPListSearchResult )then
20+
21+ luavsq.BPListSearchResult = {};
22+
23+ function luavsq.BPListSearchResult.new()
24+ local this = {};
25+ this.clock = 0;
26+ this.index = 0;
27+ this.point = luavsq.BP.new();
28+ return this;
29+ end
30+
31+end
--- luavsq/trunk/tool/SourceFilePacker.java (revision 1764)
+++ luavsq/trunk/tool/SourceFilePacker.java (revision 1765)
@@ -2,7 +2,7 @@
22 import java.util.*;
33 import java.util.regex.*;
44
5-class SourceFilePacker
5+class SourceFilePacker implements Comparator<File>
66 {
77 public static void main( String[] args )
88 {
@@ -11,10 +11,8 @@
1111 try{
1212 writer = new BufferedWriter( new OutputStreamWriter( new FileOutputStream( "luavsq.lua" ), "UTF-8" ) );
1313 writeHeader( writer );
14- for( File file : directory.listFiles() ){
15- if( false == file.getAbsolutePath().endsWith( ".lua" ) ){
16- continue;
17- }
14+ File[] files = sortSourceFiles( directory.listFiles() );
15+ for( File file : files ){
1816 concatFile( file.getAbsolutePath(), writer );
1917 }
2018 }catch( Exception e ){
@@ -28,6 +26,21 @@
2826 }
2927 }
3028
29+ private static File[] sortSourceFiles( File[] files )
30+ {
31+ Vector<File> paths = new Vector<File>();
32+ for( File file : files ){
33+ if( false == file.getAbsolutePath().endsWith( ".lua" ) ){
34+ continue;
35+ }
36+ paths.add( file );
37+ }
38+
39+ Collections.sort( paths, new SourceFilePacker() );
40+
41+ return paths.toArray( new File[0] );
42+ }
43+
3144 private static void writeHeader( BufferedWriter writer )
3245 throws IOException
3346 {
@@ -151,4 +164,21 @@
151164 }
152165 return source;
153166 }
167+
168+ public int compare( File a, File b )
169+ {
170+ if( a != null && b != null && a instanceof File && b instanceof File ){
171+ String pathA = ((File)a).getName();
172+ String pathB = ((File)b).getName();
173+ if( pathA.endsWith( ".lua" ) ){
174+ pathA = pathA.substring( 0, pathA.length() - 4 );
175+ }
176+ if( pathB.endsWith( ".lua" ) ){
177+ pathB = pathB.substring( 0, pathB.length() - 4 );
178+ }
179+ return pathA.compareTo( pathB );
180+ }else{
181+ return 0;
182+ }
183+ }
154184 }
旧リポジトリブラウザで表示