Merge lp:~cosmos-door/ubuntu/utopic/libkkc/fix-1374949 into lp:ubuntu/utopic/libkkc
- Utopic (14.10)
- fix-1374949
- Merge into utopic
Proposed by
Mitsuya Shibata
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Daniel Holbach | ||||
Proposed branch: | lp:~cosmos-door/ubuntu/utopic/libkkc/fix-1374949 | ||||
Merge into: | lp:ubuntu/utopic/libkkc | ||||
Diff against target: |
38502 lines (+13373/-11917) 163 files modified
ChangeLog (+220/-0) Makefile.am (+2/-2) Makefile.in (+2/-2) README (+2/-2) aclocal.m4 (+98/-98) configure (+22/-22) configure.ac (+5/-5) data/Makefile.am (+2/-2) data/Makefile.in (+2/-2) data/rules/Makefile.am (+2/-2) data/rules/Makefile.in (+2/-2) data/rules/README.rules (+2/-2) data/rules/default/rom-kana/default.json (+5/-0) data/templates/Makefile.am (+2/-2) data/templates/Makefile.in (+2/-2) data/templates/libkkc-data/Makefile.am (+2/-2) data/templates/libkkc-data/configure.ac.in (+2/-2) data/templates/libkkc-data/data/Makefile.am (+2/-2) data/templates/libkkc-data/data/models/Makefile.sorted2 (+2/-2) data/templates/libkkc-data/data/models/Makefile.sorted3 (+2/-2) data/templates/libkkc-data/tools/Makefile.am (+2/-2) data/templates/libkkc-data/tools/genfilter.py (+2/-2) data/templates/libkkc-data/tools/sortlm.py (+2/-2) debian/changelog (+7/-0) debian/control (+3/-2) docs/Makefile.am (+1/-1) docs/Makefile.in (+1/-1) libkkc/Kkc-1.0.gir (+2/-2) libkkc/Makefile.am (+3/-3) libkkc/Makefile.in (+3/-3) libkkc/bigram-decoder.c (+962/-1005) libkkc/bigram-decoder.vala (+9/-13) libkkc/bloom-filter.c (+36/-34) libkkc/bloom-filter.vala (+2/-2) libkkc/candidate-list.c (+198/-208) libkkc/candidate-list.vala (+3/-3) libkkc/candidate.c (+4/-6) libkkc/candidate.vala (+2/-2) libkkc/context.c (+11/-13) libkkc/context.vala (+2/-2) libkkc/convert-segment-state-handler.c (+39/-41) libkkc/convert-segment-state-handler.vala (+2/-2) libkkc/convert-sentence-state-handler.c (+77/-87) libkkc/convert-sentence-state-handler.vala (+2/-2) libkkc/decoder.c (+5/-5) libkkc/decoder.vala (+2/-2) libkkc/dictionary-list.c (+23/-27) libkkc/dictionary-list.vala (+2/-2) libkkc/dictionary.c (+405/-161) libkkc/dictionary.vala (+2/-2) libkkc/encoding.c (+74/-55) libkkc/encoding.vala (+2/-2) libkkc/expression.c (+262/-278) libkkc/expression.vala (+3/-3) libkkc/initial-state-handler.c (+546/-574) libkkc/initial-state-handler.vala (+2/-2) libkkc/key-event-filter.c (+21/-23) libkkc/key-event-filter.vala (+2/-2) libkkc/key-event.c (+688/-458) libkkc/key-event.vala (+2/-2) libkkc/keymap.c (+136/-154) libkkc/keymap.vala (+15/-21) libkkc/keysyms.c (+3/-3) libkkc/keysyms.vala (+2/-2) libkkc/kkc-1.0.deps (+1/-2) libkkc/kkc-1.0.pc.in (+3/-3) libkkc/kkc-1.0.vapi (+1/-1) libkkc/kkc-internals-1.0.vapi (+1/-1) libkkc/kkc.c (+3/-3) libkkc/kkc.vala (+2/-2) libkkc/language-model-utils.c (+3/-3) libkkc/language-model-utils.vala (+2/-2) libkkc/language-model.c (+30/-18) libkkc/language-model.vala (+2/-2) libkkc/libkkc-internals.h (+1/-1) libkkc/libkkc.h (+1/-1) libkkc/map-file.c (+34/-38) libkkc/map-file.vala (+3/-3) libkkc/metadata-file.c (+7/-7) libkkc/metadata-file.vala (+2/-2) libkkc/nicola.c (+306/-325) libkkc/nicola.vala (+4/-4) libkkc/numeric-template.c (+202/-204) libkkc/numeric-template.vala (+2/-2) libkkc/rom-kana-utils.c (+482/-260) libkkc/rom-kana-utils.vala (+2/-2) libkkc/rom-kana.c (+731/-677) libkkc/rom-kana.vala (+13/-5) libkkc/rule.c (+386/-416) libkkc/rule.vala (+21/-25) libkkc/segment-dictionary.c (+3/-3) libkkc/segment-dictionary.vala (+2/-2) libkkc/segment-list.c (+5/-5) libkkc/segment-list.vala (+2/-2) libkkc/segment.c (+3/-3) libkkc/segment.vala (+2/-2) libkkc/sentence-dictionary.c (+3/-3) libkkc/sentence-dictionary.vala (+2/-2) libkkc/sorted-bigram-language-model.c (+191/-173) libkkc/sorted-bigram-language-model.vala (+2/-2) libkkc/sorted-trigram-language-model.c (+126/-118) libkkc/sorted-trigram-language-model.vala (+2/-2) libkkc/state.c (+1548/-1368) libkkc/state.vala (+3/-3) libkkc/system-segment-dictionary.c (+426/-423) libkkc/system-segment-dictionary.vala (+2/-2) libkkc/template.c (+23/-27) libkkc/template.vala (+2/-2) libkkc/text-bigram-language-model.c (+409/-421) libkkc/text-bigram-language-model.vala (+2/-2) libkkc/text-trigram-language-model.c (+4/-4) libkkc/text-trigram-language-model.vala (+2/-2) libkkc/trellis-node.c (+10/-9) libkkc/trellis-node.vala (+2/-2) libkkc/trigram-decoder.c (+357/-378) libkkc/trigram-decoder.vala (+4/-5) libkkc/user-dictionary.c (+31/-22) libkkc/user-dictionary.vala (+2/-2) libkkc/user-rule.c (+95/-97) libkkc/user-segment-dictionary.c (+214/-177) libkkc/user-segment-dictionary.vala (+4/-4) libkkc/user-sentence-dictionary.c (+688/-415) libkkc/user-sentence-dictionary.vala (+4/-4) libkkc/utils.c (+226/-246) libkkc/utils.vala (+2/-2) m4/libtool.m4 (+2/-2) marisa-glib/Makefile.am (+2/-2) marisa-glib/Makefile.in (+2/-2) po/ja.po (+87/-67) tests/Makefile.am (+2/-2) tests/Makefile.in (+123/-123) tests/candidate-list.c (+6/-5) tests/candidate.c (+5/-4) tests/context.c (+986/-924) tests/conversions-initial.json (+3/-1) tests/decoder.c (+16/-15) tests/dictionary-list.c (+103/-98) tests/encoding.c (+27/-19) tests/expression.c (+5/-4) tests/key-event.c (+19/-18) tests/keymap.c (+75/-77) tests/language-model.c (+13/-12) tests/lib/kkc-test.vapi (+1/-1) tests/lib/libkkc-test.h (+1/-1) tests/lib/test-case.c (+59/-60) tests/lib/test-utils.c (+157/-138) tests/lib/test-utils.vala (+3/-0) tests/metadata-file.c (+29/-21) tests/rom-kana.c (+10/-9) tests/rule.c (+13/-12) tests/segment-list.c (+5/-4) tests/segment.c (+5/-4) tests/state.c (+6/-5) tests/system-dictionary.c (+65/-57) tests/template.c (+5/-4) tests/trellis-node.c (+6/-5) tests/user-dictionary.c (+503/-480) tests/user-rule.c (+104/-94) tools/Makefile.am (+2/-2) tools/Makefile.in (+2/-2) tools/kkc-package-data.in (+2/-2) tools/kkc.c (+317/-325) tools/kkc.vala (+2/-2) |
||||
To merge this branch: | bzr merge lp:~cosmos-door/ubuntu/utopic/libkkc/fix-1374949 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mitsuya Shibata (community) | Disapprove | ||
Ubuntu Development Team | Pending | ||
Review via email:
|
Commit message
Description of the change
* New upsteam release
* Change Build-Depends from libgee-dev to libgee-0.8-dev
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Mitsuya Shibata (cosmos-door) : | # |
review:
Disapprove
Unmerged revisions
- 5. By Mitsuya Shibata
-
Change Build-Depends from libgee-dev to libgee-0.8-dev (LP: #1374949)
- 4. By Mitsuya Shibata
-
Import upstream version 0.3.4
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2014-06-15 23:27:57 +0000 |
3 | +++ ChangeLog 2014-10-01 15:12:30 +0000 |
4 | @@ -1,3 +1,223 @@ |
5 | +commit 4ffd6c8331d4575678aca7cad7c5e839d7dbd736 |
6 | +Author: Daiki Ueno <ueno@unixuser.org> |
7 | +Date: Mon Jul 7 13:09:45 2014 +0900 |
8 | + |
9 | + Revert "build: Switch from intltool to gettext" |
10 | + |
11 | + This reverts commit 25e166bda1f6308a9b4f26268791d55781112620. |
12 | + The required gettext version 0.19.1 is not yet available on many |
13 | + systems. |
14 | + |
15 | + configure.ac | 3 +-- |
16 | + po/Makevars | 72 |
17 | + ------------------------------------------------------------ |
18 | + 2 files changed, 1 insertion(+), 74 deletions(-) |
19 | + |
20 | +commit 784377b6c2aa7e78e193b4c4a7ebde9e1a5aeba3 |
21 | +Author: Daiki Ueno <ueno@unixuser.org> |
22 | +Date: Mon Jul 7 13:06:29 2014 +0900 |
23 | + |
24 | + Bump version to 0.3.4 |
25 | + |
26 | + configure.ac | 2 +- |
27 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
28 | + |
29 | +commit 3cff841d1fb430fcb30236e20e7ec84214f2d9c1 |
30 | +Author: Daiki Ueno <ueno@unixuser.org> |
31 | +Date: Mon Jul 7 13:05:36 2014 +0900 |
32 | + |
33 | + Update copyright year |
34 | + |
35 | + Makefile.am | 4 ++-- |
36 | + README | 4 ++-- |
37 | + configure.ac | 4 ++-- |
38 | + data/Makefile.am | 4 ++-- |
39 | + data/rules/Makefile.am | 4 ++-- |
40 | + data/rules/README.rules | 4 ++-- |
41 | + data/templates/Makefile.am | 4 ++-- |
42 | + data/templates/libkkc-data/Makefile.am | 4 ++-- |
43 | + data/templates/libkkc-data/configure.ac.in | 4 ++-- |
44 | + data/templates/libkkc-data/data/Makefile.am | 4 ++-- |
45 | + data/templates/libkkc-data/data/models/Makefile.sorted2 | 4 ++-- |
46 | + data/templates/libkkc-data/data/models/Makefile.sorted3 | 4 ++-- |
47 | + data/templates/libkkc-data/tools/Makefile.am | 4 ++-- |
48 | + data/templates/libkkc-data/tools/genfilter.py | 4 ++-- |
49 | + data/templates/libkkc-data/tools/sortlm.py | 4 ++-- |
50 | + libkkc/Makefile.am | 4 ++-- |
51 | + libkkc/bigram-decoder.vala | 4 ++-- |
52 | + libkkc/bloom-filter.vala | 4 ++-- |
53 | + libkkc/candidate-list.vala | 4 ++-- |
54 | + libkkc/candidate.vala | 4 ++-- |
55 | + libkkc/context.vala | 4 ++-- |
56 | + libkkc/convert-segment-state-handler.vala | 4 ++-- |
57 | + libkkc/convert-sentence-state-handler.vala | 4 ++-- |
58 | + libkkc/decoder.vala | 4 ++-- |
59 | + libkkc/dictionary-list.vala | 4 ++-- |
60 | + libkkc/dictionary.vala | 4 ++-- |
61 | + libkkc/encoding.vala | 4 ++-- |
62 | + libkkc/expression.vala | 4 ++-- |
63 | + libkkc/initial-state-handler.vala | 4 ++-- |
64 | + libkkc/key-event-filter.vala | 4 ++-- |
65 | + libkkc/key-event.vala | 4 ++-- |
66 | + libkkc/keymap.vala | 4 ++-- |
67 | + libkkc/keysyms.vala | 4 ++-- |
68 | + libkkc/kkc-1.0.pc.in | 4 ++-- |
69 | + libkkc/kkc.vala | 4 ++-- |
70 | + libkkc/language-model-utils.vala | 4 ++-- |
71 | + libkkc/language-model.vala | 4 ++-- |
72 | + libkkc/map-file.vala | 4 ++-- |
73 | + libkkc/metadata-file.vala | 4 ++-- |
74 | + libkkc/nicola.vala | 4 ++-- |
75 | + libkkc/numeric-template.vala | 4 ++-- |
76 | + libkkc/rom-kana-utils.vala | 4 ++-- |
77 | + libkkc/rom-kana.vala | 4 ++-- |
78 | + libkkc/rule.vala | 4 ++-- |
79 | + libkkc/segment-dictionary.vala | 4 ++-- |
80 | + libkkc/segment-list.vala | 4 ++-- |
81 | + libkkc/segment.vala | 4 ++-- |
82 | + libkkc/sentence-dictionary.vala | 4 ++-- |
83 | + libkkc/sorted-bigram-language-model.vala | 4 ++-- |
84 | + libkkc/sorted-trigram-language-model.vala | 4 ++-- |
85 | + libkkc/state.vala | 4 ++-- |
86 | + libkkc/system-segment-dictionary.vala | 4 ++-- |
87 | + libkkc/template.vala | 4 ++-- |
88 | + libkkc/text-bigram-language-model.vala | 4 ++-- |
89 | + libkkc/text-trigram-language-model.vala | 4 ++-- |
90 | + libkkc/trellis-node.vala | 4 ++-- |
91 | + libkkc/trigram-decoder.vala | 4 ++-- |
92 | + libkkc/user-dictionary.vala | 4 ++-- |
93 | + libkkc/user-segment-dictionary.vala | 4 ++-- |
94 | + libkkc/user-sentence-dictionary.vala | 4 ++-- |
95 | + libkkc/utils.vala | 4 ++-- |
96 | + marisa-glib/Makefile.am | 4 ++-- |
97 | + tests/Makefile.am | 4 ++-- |
98 | + tools/Makefile.am | 4 ++-- |
99 | + tools/kkc-package-data.in | 4 ++-- |
100 | + tools/kkc.vala | 4 ++-- |
101 | + 66 files changed, 132 insertions(+), 132 deletions(-) |
102 | + |
103 | +commit 025d2fb3bf7e05bd7367d459bbf0557d5e929eab |
104 | +Author: Daiki Ueno <ueno@unixuser.org> |
105 | +Date: Mon Jun 16 12:18:40 2014 +0900 |
106 | + |
107 | + Update translations |
108 | + |
109 | + po/ja.po | 8 +++++++- |
110 | + 1 file changed, 7 insertions(+), 1 deletion(-) |
111 | + |
112 | +commit 95ecc6d8a21814a093e013c60e370ac49407013a |
113 | +Author: Daiki Ueno <ueno@unixuser.org> |
114 | +Date: Mon Jun 16 12:13:19 2014 +0900 |
115 | + |
116 | + Update translations |
117 | + |
118 | + po/ja.po | 148 |
119 | + ++++++++++++++++++++++++++++++++++----------------------------- |
120 | + 1 file changed, 81 insertions(+), 67 deletions(-) |
121 | + |
122 | +commit 25e166bda1f6308a9b4f26268791d55781112620 |
123 | +Author: Daiki Ueno <ueno@unixuser.org> |
124 | +Date: Mon Jun 16 12:10:51 2014 +0900 |
125 | + |
126 | + build: Switch from intltool to gettext |
127 | + |
128 | + configure.ac | 3 ++- |
129 | + po/Makevars | 72 |
130 | + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
131 | + 2 files changed, 74 insertions(+), 1 deletion(-) |
132 | + |
133 | +commit e5a21c69386a1c6681d63f5201fde2230a51f27a |
134 | +Author: Daiki Ueno <ueno@unixuser.org> |
135 | +Date: Mon Jun 16 12:00:41 2014 +0900 |
136 | + |
137 | + Fix dependencies |
138 | + |
139 | + Can't make json-glib-1.0 and gee-0.8 optional, since some classes |
140 | + provide |
141 | + API using it for performance reason. |
142 | + |
143 | + libkkc/kkc-1.0.deps | 1 + |
144 | + libkkc/kkc-1.0.pc.in | 3 +-- |
145 | + 2 files changed, 2 insertions(+), 2 deletions(-) |
146 | + |
147 | +commit 82ab9a22f97852fcc096347a663b3ea3b95626a8 |
148 | +Author: Daiki Ueno <ueno@unixuser.org> |
149 | +Date: Mon Jun 16 11:27:23 2014 +0900 |
150 | + |
151 | + Fix package dependencies |
152 | + |
153 | + libkkc/kkc-1.0.deps | 2 -- |
154 | + libkkc/kkc-1.0.pc.in | 4 ++-- |
155 | + 2 files changed, 2 insertions(+), 4 deletions(-) |
156 | + |
157 | +commit baf68310e26cd090b6b5d7b4604cb4fcd5e5ca4f |
158 | +Author: Daiki Ueno <ueno@unixuser.org> |
159 | +Date: Mon Jun 16 11:17:36 2014 +0900 |
160 | + |
161 | + Fix HashSet name clash between Vala 0.26 glib-2.0.vapi and |
162 | + gee-0.8.vapi |
163 | + |
164 | + libkkc/bigram-decoder.vala | 2 +- |
165 | + libkkc/candidate-list.vala | 2 +- |
166 | + libkkc/map-file.vala | 2 +- |
167 | + libkkc/rule.vala | 2 +- |
168 | + libkkc/trigram-decoder.vala | 4 ++-- |
169 | + 5 files changed, 6 insertions(+), 6 deletions(-) |
170 | + |
171 | +commit ebc714b954a7798646371eb3fd6fe4e51638f329 |
172 | +Author: Daiki Ueno <ueno@unixuser.org> |
173 | +Date: Mon Jun 16 11:12:50 2014 +0900 |
174 | + |
175 | + Port to libgee 0.8 API |
176 | + |
177 | + configure.ac | 4 ++-- |
178 | + libkkc/Makefile.am | 2 +- |
179 | + libkkc/bigram-decoder.vala | 12 ++++------- |
180 | + libkkc/expression.vala | 2 +- |
181 | + libkkc/keymap.vala | 32 ++++++++++++----------------- |
182 | + libkkc/kkc-1.0.pc.in | 2 +- |
183 | + libkkc/nicola.vala | 4 ++-- |
184 | + libkkc/rule.vala | 40 |
185 | + ++++++++++++++++-------------------- |
186 | + libkkc/state.vala | 2 +- |
187 | + libkkc/trigram-decoder.vala | 3 +-- |
188 | + libkkc/user-segment-dictionary.vala | 4 ++-- |
189 | + libkkc/user-sentence-dictionary.vala | 4 ++-- |
190 | + 12 files changed, 48 insertions(+), 63 deletions(-) |
191 | + |
192 | +commit 8a5366c976b0399a69e6b9f622ad29f987c8a52e |
193 | +Author: Daiki Ueno <ueno@unixuser.org> |
194 | +Date: Mon Jun 16 10:50:34 2014 +0900 |
195 | + |
196 | + kkc-1.0.pc: Mark libgee and json-glib as private dependency |
197 | + |
198 | + libkkc/kkc-1.0.pc.in | 3 ++- |
199 | + 1 file changed, 2 insertions(+), 1 deletion(-) |
200 | + |
201 | +commit 72a596d438f5ede05c59d733a05ba566a1259bcd |
202 | +Author: Daiki Ueno <ueno@unixuser.org> |
203 | +Date: Tue May 13 16:30:46 2014 +0900 |
204 | + |
205 | + rom-kana: Retain partial input when "convert-*" commands are called |
206 | + |
207 | + Suggested by Masafumi Miura. |
208 | + |
209 | + libkkc/rom-kana.vala | 14 +++++++++++--- |
210 | + tests/conversions-initial.json | 4 +++- |
211 | + tests/lib/test-utils.vala | 3 +++ |
212 | + 3 files changed, 17 insertions(+), 4 deletions(-) |
213 | + |
214 | +commit 5f38726532b8790e1320e1b35bc326439ef9cdb0 |
215 | +Author: Daiki Ueno <ueno@unixuser.org> |
216 | +Date: Tue May 13 12:04:27 2014 +0900 |
217 | + |
218 | + rom-kana: Assign "ly<X>" to HIRAGANA SMALL LETTER <X> |
219 | + |
220 | + Suggested by Masafumi Miura. |
221 | + |
222 | + data/rules/default/rom-kana/default.json | 5 +++++ |
223 | + 1 file changed, 5 insertions(+) |
224 | + |
225 | commit 4859e8ab00b215d1cf6830a31cbb1abe8c0f06b1 |
226 | Author: Daiki Ueno <ueno@unixuser.org> |
227 | Date: Tue Apr 1 18:17:33 2014 +0900 |
228 | |
229 | === modified file 'Makefile.am' |
230 | --- Makefile.am 2014-02-26 22:51:39 +0000 |
231 | +++ Makefile.am 2014-10-01 15:12:30 +0000 |
232 | @@ -1,5 +1,5 @@ |
233 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
234 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
235 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
236 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
237 | |
238 | # This program is free software: you can redistribute it and/or modify |
239 | # it under the terms of the GNU General Public License as published by |
240 | |
241 | === modified file 'Makefile.in' |
242 | --- Makefile.in 2014-02-26 22:51:39 +0000 |
243 | +++ Makefile.in 2014-10-01 15:12:30 +0000 |
244 | @@ -14,8 +14,8 @@ |
245 | |
246 | @SET_MAKE@ |
247 | |
248 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
249 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
250 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
251 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
252 | |
253 | # This program is free software: you can redistribute it and/or modify |
254 | # it under the terms of the GNU General Public License as published by |
255 | |
256 | === modified file 'README' |
257 | --- README 2014-02-26 22:51:39 +0000 |
258 | +++ README 2014-10-01 15:12:30 +0000 |
259 | @@ -46,8 +46,8 @@ |
260 | |
261 | GPLv3+ |
262 | |
263 | -Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
264 | -Copyright (C) 2011-2013 Red Hat, Inc. |
265 | +Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
266 | +Copyright (C) 2011-2014 Red Hat, Inc. |
267 | |
268 | This file is free software; as a special exception the author gives |
269 | unlimited permission to copy and/or distribute it, with or without |
270 | |
271 | === modified file 'aclocal.m4' |
272 | --- aclocal.m4 2014-06-15 23:27:57 +0000 |
273 | +++ aclocal.m4 2014-10-01 15:12:30 +0000 |
274 | @@ -20,105 +20,8 @@ |
275 | If you have problems, you may need to regenerate the build system entirely. |
276 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
277 | |
278 | -dnl -*- mode: autoconf -*- |
279 | -dnl Copyright 2009 Johan Dahlin |
280 | -dnl |
281 | -dnl This file is free software; the author(s) gives unlimited |
282 | -dnl permission to copy and/or distribute it, with or without |
283 | -dnl modifications, as long as this notice is preserved. |
284 | -dnl |
285 | - |
286 | -# serial 1 |
287 | - |
288 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
289 | -[ |
290 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
291 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
292 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
293 | - |
294 | - dnl enable/disable introspection |
295 | - m4_if([$2], [require], |
296 | - [dnl |
297 | - enable_introspection=yes |
298 | - ],[dnl |
299 | - AC_ARG_ENABLE(introspection, |
300 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
301 | - [Enable introspection for this build]),, |
302 | - [enable_introspection=auto]) |
303 | - ])dnl |
304 | - |
305 | - AC_MSG_CHECKING([for gobject-introspection]) |
306 | - |
307 | - dnl presence/version checking |
308 | - AS_CASE([$enable_introspection], |
309 | - [no], [dnl |
310 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
311 | - ],dnl |
312 | - [yes],[dnl |
313 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
314 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
315 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
316 | - found_introspection=yes, |
317 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
318 | - ],dnl |
319 | - [auto],[dnl |
320 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
321 | - dnl Canonicalize enable_introspection |
322 | - enable_introspection=$found_introspection |
323 | - ],dnl |
324 | - [dnl |
325 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
326 | - ])dnl |
327 | - |
328 | - AC_MSG_RESULT([$found_introspection]) |
329 | - |
330 | - INTROSPECTION_SCANNER= |
331 | - INTROSPECTION_COMPILER= |
332 | - INTROSPECTION_GENERATE= |
333 | - INTROSPECTION_GIRDIR= |
334 | - INTROSPECTION_TYPELIBDIR= |
335 | - if test "x$found_introspection" = "xyes"; then |
336 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
337 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
338 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
339 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
340 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
341 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
342 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
343 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
344 | - fi |
345 | - AC_SUBST(INTROSPECTION_SCANNER) |
346 | - AC_SUBST(INTROSPECTION_COMPILER) |
347 | - AC_SUBST(INTROSPECTION_GENERATE) |
348 | - AC_SUBST(INTROSPECTION_GIRDIR) |
349 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) |
350 | - AC_SUBST(INTROSPECTION_CFLAGS) |
351 | - AC_SUBST(INTROSPECTION_LIBS) |
352 | - AC_SUBST(INTROSPECTION_MAKEFILE) |
353 | - |
354 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
355 | -]) |
356 | - |
357 | - |
358 | -dnl Usage: |
359 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
360 | - |
361 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
362 | -[ |
363 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
364 | -]) |
365 | - |
366 | -dnl Usage: |
367 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
368 | - |
369 | - |
370 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
371 | -[ |
372 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
373 | -]) |
374 | - |
375 | # nls.m4 serial 5 (gettext-0.18) |
376 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
377 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, |
378 | dnl Inc. |
379 | dnl This file is free software; the Free Software Foundation |
380 | dnl gives unlimited permission to copy and/or distribute it, |
381 | @@ -365,6 +268,103 @@ |
382 | AS_VAR_IF([$1], [""], [$5], [$4])dnl |
383 | ])# PKG_CHECK_VAR |
384 | |
385 | +dnl -*- mode: autoconf -*- |
386 | +dnl Copyright 2009 Johan Dahlin |
387 | +dnl |
388 | +dnl This file is free software; the author(s) gives unlimited |
389 | +dnl permission to copy and/or distribute it, with or without |
390 | +dnl modifications, as long as this notice is preserved. |
391 | +dnl |
392 | + |
393 | +# serial 1 |
394 | + |
395 | +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
396 | +[ |
397 | + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
398 | + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
399 | + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
400 | + |
401 | + dnl enable/disable introspection |
402 | + m4_if([$2], [require], |
403 | + [dnl |
404 | + enable_introspection=yes |
405 | + ],[dnl |
406 | + AC_ARG_ENABLE(introspection, |
407 | + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
408 | + [Enable introspection for this build]),, |
409 | + [enable_introspection=auto]) |
410 | + ])dnl |
411 | + |
412 | + AC_MSG_CHECKING([for gobject-introspection]) |
413 | + |
414 | + dnl presence/version checking |
415 | + AS_CASE([$enable_introspection], |
416 | + [no], [dnl |
417 | + found_introspection="no (disabled, use --enable-introspection to enable)" |
418 | + ],dnl |
419 | + [yes],[dnl |
420 | + PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
421 | + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
422 | + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
423 | + found_introspection=yes, |
424 | + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
425 | + ],dnl |
426 | + [auto],[dnl |
427 | + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
428 | + dnl Canonicalize enable_introspection |
429 | + enable_introspection=$found_introspection |
430 | + ],dnl |
431 | + [dnl |
432 | + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
433 | + ])dnl |
434 | + |
435 | + AC_MSG_RESULT([$found_introspection]) |
436 | + |
437 | + INTROSPECTION_SCANNER= |
438 | + INTROSPECTION_COMPILER= |
439 | + INTROSPECTION_GENERATE= |
440 | + INTROSPECTION_GIRDIR= |
441 | + INTROSPECTION_TYPELIBDIR= |
442 | + if test "x$found_introspection" = "xyes"; then |
443 | + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
444 | + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
445 | + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
446 | + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
447 | + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
448 | + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
449 | + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
450 | + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
451 | + fi |
452 | + AC_SUBST(INTROSPECTION_SCANNER) |
453 | + AC_SUBST(INTROSPECTION_COMPILER) |
454 | + AC_SUBST(INTROSPECTION_GENERATE) |
455 | + AC_SUBST(INTROSPECTION_GIRDIR) |
456 | + AC_SUBST(INTROSPECTION_TYPELIBDIR) |
457 | + AC_SUBST(INTROSPECTION_CFLAGS) |
458 | + AC_SUBST(INTROSPECTION_LIBS) |
459 | + AC_SUBST(INTROSPECTION_MAKEFILE) |
460 | + |
461 | + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
462 | +]) |
463 | + |
464 | + |
465 | +dnl Usage: |
466 | +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
467 | + |
468 | +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
469 | +[ |
470 | + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
471 | +]) |
472 | + |
473 | +dnl Usage: |
474 | +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
475 | + |
476 | + |
477 | +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
478 | +[ |
479 | + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
480 | +]) |
481 | + |
482 | dnl vapigen.m4 |
483 | dnl |
484 | dnl Copyright 2012 Evan Nemerson |
485 | |
486 | === modified file 'configure' |
487 | --- configure 2014-06-15 23:27:57 +0000 |
488 | +++ configure 2014-10-01 15:12:30 +0000 |
489 | @@ -1,6 +1,6 @@ |
490 | #! /bin/sh |
491 | # Guess values for system-dependent variables and create Makefiles. |
492 | -# Generated by GNU Autoconf 2.69 for libkkc 0.3.3. |
493 | +# Generated by GNU Autoconf 2.69 for libkkc 0.3.4. |
494 | # |
495 | # Report bugs to <ueno@gnu.org>. |
496 | # |
497 | @@ -649,8 +649,8 @@ |
498 | # Identity of this package. |
499 | PACKAGE_NAME='libkkc' |
500 | PACKAGE_TARNAME='libkkc' |
501 | -PACKAGE_VERSION='0.3.3' |
502 | -PACKAGE_STRING='libkkc 0.3.3' |
503 | +PACKAGE_VERSION='0.3.4' |
504 | +PACKAGE_STRING='libkkc 0.3.4' |
505 | PACKAGE_BUGREPORT='ueno@gnu.org' |
506 | PACKAGE_URL='' |
507 | |
508 | @@ -1501,7 +1501,7 @@ |
509 | # Omit some internal or obsolete options to make the list less imposing. |
510 | # This message is too long to be a string in the A/UX 3.1 sh. |
511 | cat <<_ACEOF |
512 | -\`configure' configures libkkc 0.3.3 to adapt to many kinds of systems. |
513 | +\`configure' configures libkkc 0.3.4 to adapt to many kinds of systems. |
514 | |
515 | Usage: $0 [OPTION]... [VAR=VALUE]... |
516 | |
517 | @@ -1571,7 +1571,7 @@ |
518 | |
519 | if test -n "$ac_init_help"; then |
520 | case $ac_init_help in |
521 | - short | recursive ) echo "Configuration of libkkc 0.3.3:";; |
522 | + short | recursive ) echo "Configuration of libkkc 0.3.4:";; |
523 | esac |
524 | cat <<\_ACEOF |
525 | |
526 | @@ -1712,7 +1712,7 @@ |
527 | test -n "$ac_init_help" && exit $ac_status |
528 | if $ac_init_version; then |
529 | cat <<\_ACEOF |
530 | -libkkc configure 0.3.3 |
531 | +libkkc configure 0.3.4 |
532 | generated by GNU Autoconf 2.69 |
533 | |
534 | Copyright (C) 2012 Free Software Foundation, Inc. |
535 | @@ -2202,7 +2202,7 @@ |
536 | This file contains any messages produced by compilers while |
537 | running configure, to aid debugging if configure makes a mistake. |
538 | |
539 | -It was created by libkkc $as_me 0.3.3, which was |
540 | +It was created by libkkc $as_me 0.3.4, which was |
541 | generated by GNU Autoconf 2.69. Invocation command line was |
542 | |
543 | $ $0 $@ |
544 | @@ -3080,7 +3080,7 @@ |
545 | |
546 | # Define the identity of the package. |
547 | PACKAGE='libkkc' |
548 | - VERSION='0.3.3' |
549 | + VERSION='0.3.4' |
550 | |
551 | |
552 | cat >>confdefs.h <<_ACEOF |
553 | @@ -9390,10 +9390,10 @@ |
554 | x86_64-*linux*) |
555 | LD="${LD-ld} -m elf_i386" |
556 | ;; |
557 | - powerpcle-*linux*) |
558 | + powerpc64le-*linux*) |
559 | LD="${LD-ld} -m elf32lppclinux" |
560 | ;; |
561 | - powerpc-*linux*) |
562 | + powerpc64-*linux*) |
563 | LD="${LD-ld} -m elf32ppclinux" |
564 | ;; |
565 | s390x-*linux*) |
566 | @@ -17679,12 +17679,12 @@ |
567 | pkg_cv_GEE_CFLAGS="$GEE_CFLAGS" |
568 | elif test -n "$PKG_CONFIG"; then |
569 | if test -n "$PKG_CONFIG" && \ |
570 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-1.0\""; } >&5 |
571 | - ($PKG_CONFIG --exists --print-errors "gee-1.0") 2>&5 |
572 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8\""; } >&5 |
573 | + ($PKG_CONFIG --exists --print-errors "gee-0.8") 2>&5 |
574 | ac_status=$? |
575 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
576 | test $ac_status = 0; }; then |
577 | - pkg_cv_GEE_CFLAGS=`$PKG_CONFIG --cflags "gee-1.0" 2>/dev/null` |
578 | + pkg_cv_GEE_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8" 2>/dev/null` |
579 | test "x$?" != "x0" && pkg_failed=yes |
580 | else |
581 | pkg_failed=yes |
582 | @@ -17696,12 +17696,12 @@ |
583 | pkg_cv_GEE_LIBS="$GEE_LIBS" |
584 | elif test -n "$PKG_CONFIG"; then |
585 | if test -n "$PKG_CONFIG" && \ |
586 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-1.0\""; } >&5 |
587 | - ($PKG_CONFIG --exists --print-errors "gee-1.0") 2>&5 |
588 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8\""; } >&5 |
589 | + ($PKG_CONFIG --exists --print-errors "gee-0.8") 2>&5 |
590 | ac_status=$? |
591 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
592 | test $ac_status = 0; }; then |
593 | - pkg_cv_GEE_LIBS=`$PKG_CONFIG --libs "gee-1.0" 2>/dev/null` |
594 | + pkg_cv_GEE_LIBS=`$PKG_CONFIG --libs "gee-0.8" 2>/dev/null` |
595 | test "x$?" != "x0" && pkg_failed=yes |
596 | else |
597 | pkg_failed=yes |
598 | @@ -17722,18 +17722,18 @@ |
599 | _pkg_short_errors_supported=no |
600 | fi |
601 | if test $_pkg_short_errors_supported = yes; then |
602 | - GEE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-1.0" 2>&1` |
603 | + GEE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8" 2>&1` |
604 | else |
605 | - GEE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-1.0" 2>&1` |
606 | + GEE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8" 2>&1` |
607 | fi |
608 | # Put the nasty error message in config.log where it belongs |
609 | echo "$GEE_PKG_ERRORS" >&5 |
610 | |
611 | - as_fn_error $? "can't find gee-1.0" "$LINENO" 5 |
612 | + as_fn_error $? "can't find gee-0.8" "$LINENO" 5 |
613 | elif test $pkg_failed = untried; then |
614 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
615 | $as_echo "no" >&6; } |
616 | - as_fn_error $? "can't find gee-1.0" "$LINENO" 5 |
617 | + as_fn_error $? "can't find gee-0.8" "$LINENO" 5 |
618 | else |
619 | GEE_CFLAGS=$pkg_cv_GEE_CFLAGS |
620 | GEE_LIBS=$pkg_cv_GEE_LIBS |
621 | @@ -19222,7 +19222,7 @@ |
622 | # report actual input values of CONFIG_FILES etc. instead of their |
623 | # values after options handling. |
624 | ac_log=" |
625 | -This file was extended by libkkc $as_me 0.3.3, which was |
626 | +This file was extended by libkkc $as_me 0.3.4, which was |
627 | generated by GNU Autoconf 2.69. Invocation command line was |
628 | |
629 | CONFIG_FILES = $CONFIG_FILES |
630 | @@ -19288,7 +19288,7 @@ |
631 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
632 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
633 | ac_cs_version="\\ |
634 | -libkkc config.status 0.3.3 |
635 | +libkkc config.status 0.3.4 |
636 | configured by $0, generated by GNU Autoconf 2.69, |
637 | with options \\"\$ac_cs_config\\" |
638 | |
639 | |
640 | === modified file 'configure.ac' |
641 | --- configure.ac 2014-06-15 23:27:57 +0000 |
642 | +++ configure.ac 2014-10-01 15:12:30 +0000 |
643 | @@ -1,5 +1,5 @@ |
644 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
645 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
646 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
647 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
648 | |
649 | # This program is free software: you can redistribute it and/or modify |
650 | # it under the terms of the GNU General Public License as published by |
651 | @@ -17,7 +17,7 @@ |
652 | AC_PREREQ(2.63) |
653 | AC_CONFIG_MACRO_DIR([m4]) |
654 | |
655 | -AC_INIT([libkkc], [0.3.3], [ueno@gnu.org]) |
656 | +AC_INIT([libkkc], [0.3.4], [ueno@gnu.org]) |
657 | |
658 | KKC_API_VERSION=1.0 |
659 | KKC_API_MAJOR_VERSION=1 |
660 | @@ -75,8 +75,8 @@ |
661 | [AC_MSG_ERROR([can't find gio-2.0])]) |
662 | |
663 | # check gee |
664 | -PKG_CHECK_MODULES([GEE], [gee-1.0], , |
665 | - [AC_MSG_ERROR([can't find gee-1.0])]) |
666 | +PKG_CHECK_MODULES([GEE], [gee-0.8], , |
667 | + [AC_MSG_ERROR([can't find gee-0.8])]) |
668 | |
669 | # check json-glib |
670 | PKG_CHECK_MODULES([JSON_GLIB], [json-glib-1.0], , |
671 | |
672 | === modified file 'data/Makefile.am' |
673 | --- data/Makefile.am 2014-02-26 22:51:39 +0000 |
674 | +++ data/Makefile.am 2014-10-01 15:12:30 +0000 |
675 | @@ -1,5 +1,5 @@ |
676 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
677 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
678 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
679 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
680 | |
681 | # This program is free software: you can redistribute it and/or modify |
682 | # it under the terms of the GNU General Public License as published by |
683 | |
684 | === modified file 'data/Makefile.in' |
685 | --- data/Makefile.in 2014-02-26 22:51:39 +0000 |
686 | +++ data/Makefile.in 2014-10-01 15:12:30 +0000 |
687 | @@ -14,8 +14,8 @@ |
688 | |
689 | @SET_MAKE@ |
690 | |
691 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
692 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
693 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
694 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
695 | |
696 | # This program is free software: you can redistribute it and/or modify |
697 | # it under the terms of the GNU General Public License as published by |
698 | |
699 | === modified file 'data/rules/Makefile.am' |
700 | --- data/rules/Makefile.am 2014-02-26 22:51:39 +0000 |
701 | +++ data/rules/Makefile.am 2014-10-01 15:12:30 +0000 |
702 | @@ -1,5 +1,5 @@ |
703 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
704 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
705 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
706 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
707 | |
708 | # This program is free software: you can redistribute it and/or modify |
709 | # it under the terms of the GNU General Public License as published by |
710 | |
711 | === modified file 'data/rules/Makefile.in' |
712 | --- data/rules/Makefile.in 2014-02-26 22:51:39 +0000 |
713 | +++ data/rules/Makefile.in 2014-10-01 15:12:30 +0000 |
714 | @@ -14,8 +14,8 @@ |
715 | |
716 | @SET_MAKE@ |
717 | |
718 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
719 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
720 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
721 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
722 | |
723 | # This program is free software: you can redistribute it and/or modify |
724 | # it under the terms of the GNU General Public License as published by |
725 | |
726 | === modified file 'data/rules/README.rules' |
727 | --- data/rules/README.rules 2014-02-26 22:51:39 +0000 |
728 | +++ data/rules/README.rules 2014-10-01 15:12:30 +0000 |
729 | @@ -161,8 +161,8 @@ |
730 | for "xka" and "b.", and removes a mapping "dha" from the current map |
731 | file. |
732 | |
733 | -Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
734 | -Copyright (C) 2011-2013 Red Hat, Inc. |
735 | +Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
736 | +Copyright (C) 2011-2014 Red Hat, Inc. |
737 | |
738 | This file is free software; as a special exception the author gives |
739 | unlimited permission to copy and/or distribute it, with or without |
740 | |
741 | === modified file 'data/rules/default/rom-kana/default.json' |
742 | --- data/rules/default/rom-kana/default.json 2014-02-26 22:51:39 +0000 |
743 | +++ data/rules/default/rom-kana/default.json 2014-10-01 15:12:30 +0000 |
744 | @@ -97,6 +97,11 @@ |
745 | "lu": ["", "ぅ"], |
746 | "le": ["", "ぇ"], |
747 | "lo": ["", "ぉ"], |
748 | + "lya": ["", "ゃ"], |
749 | + "lyi": ["", "ぃ"], |
750 | + "lyu": ["", "ゅ"], |
751 | + "lye": ["", "ぇ"], |
752 | + "lyo": ["", "ょ"], |
753 | "kya": ["", "きゃ" ], |
754 | "kye": ["", "きぇ" ], |
755 | "kyi": ["", "きぃ" ], |
756 | |
757 | === modified file 'data/templates/Makefile.am' |
758 | --- data/templates/Makefile.am 2014-02-26 22:51:39 +0000 |
759 | +++ data/templates/Makefile.am 2014-10-01 15:12:30 +0000 |
760 | @@ -1,5 +1,5 @@ |
761 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
762 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
763 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
764 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
765 | |
766 | # This program is free software: you can redistribute it and/or modify |
767 | # it under the terms of the GNU General Public License as published by |
768 | |
769 | === modified file 'data/templates/Makefile.in' |
770 | --- data/templates/Makefile.in 2014-02-26 22:51:39 +0000 |
771 | +++ data/templates/Makefile.in 2014-10-01 15:12:30 +0000 |
772 | @@ -14,8 +14,8 @@ |
773 | |
774 | @SET_MAKE@ |
775 | |
776 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
777 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
778 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
779 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
780 | |
781 | # This program is free software: you can redistribute it and/or modify |
782 | # it under the terms of the GNU General Public License as published by |
783 | |
784 | === modified file 'data/templates/libkkc-data/Makefile.am' |
785 | --- data/templates/libkkc-data/Makefile.am 2014-02-26 22:51:39 +0000 |
786 | +++ data/templates/libkkc-data/Makefile.am 2014-10-01 15:12:30 +0000 |
787 | @@ -1,5 +1,5 @@ |
788 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
789 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
790 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
791 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
792 | |
793 | # This program is free software: you can redistribute it and/or modify |
794 | # it under the terms of the GNU General Public License as published by |
795 | |
796 | === modified file 'data/templates/libkkc-data/configure.ac.in' |
797 | --- data/templates/libkkc-data/configure.ac.in 2014-02-26 22:51:39 +0000 |
798 | +++ data/templates/libkkc-data/configure.ac.in 2014-10-01 15:12:30 +0000 |
799 | @@ -1,5 +1,5 @@ |
800 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
801 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
802 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
803 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
804 | |
805 | # This program is free software: you can redistribute it and/or modify |
806 | # it under the terms of the GNU General Public License as published by |
807 | |
808 | === modified file 'data/templates/libkkc-data/data/Makefile.am' |
809 | --- data/templates/libkkc-data/data/Makefile.am 2014-02-26 22:51:39 +0000 |
810 | +++ data/templates/libkkc-data/data/Makefile.am 2014-10-01 15:12:30 +0000 |
811 | @@ -1,5 +1,5 @@ |
812 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
813 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
814 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
815 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
816 | |
817 | # This program is free software: you can redistribute it and/or modify |
818 | # it under the terms of the GNU General Public License as published by |
819 | |
820 | === modified file 'data/templates/libkkc-data/data/models/Makefile.sorted2' |
821 | --- data/templates/libkkc-data/data/models/Makefile.sorted2 2014-02-26 22:51:39 +0000 |
822 | +++ data/templates/libkkc-data/data/models/Makefile.sorted2 2014-10-01 15:12:30 +0000 |
823 | @@ -1,5 +1,5 @@ |
824 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
825 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
826 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
827 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
828 | |
829 | # This program is free software: you can redistribute it and/or modify |
830 | # it under the terms of the GNU General Public License as published by |
831 | |
832 | === modified file 'data/templates/libkkc-data/data/models/Makefile.sorted3' |
833 | --- data/templates/libkkc-data/data/models/Makefile.sorted3 2014-02-26 22:51:39 +0000 |
834 | +++ data/templates/libkkc-data/data/models/Makefile.sorted3 2014-10-01 15:12:30 +0000 |
835 | @@ -1,5 +1,5 @@ |
836 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
837 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
838 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
839 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
840 | |
841 | # This program is free software: you can redistribute it and/or modify |
842 | # it under the terms of the GNU General Public License as published by |
843 | |
844 | === modified file 'data/templates/libkkc-data/tools/Makefile.am' |
845 | --- data/templates/libkkc-data/tools/Makefile.am 2014-02-26 22:51:39 +0000 |
846 | +++ data/templates/libkkc-data/tools/Makefile.am 2014-10-01 15:12:30 +0000 |
847 | @@ -1,5 +1,5 @@ |
848 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
849 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
850 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
851 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
852 | |
853 | # This program is free software: you can redistribute it and/or modify |
854 | # it under the terms of the GNU General Public License as published by |
855 | |
856 | === modified file 'data/templates/libkkc-data/tools/genfilter.py' |
857 | --- data/templates/libkkc-data/tools/genfilter.py 2014-02-26 22:51:39 +0000 |
858 | +++ data/templates/libkkc-data/tools/genfilter.py 2014-10-01 15:12:30 +0000 |
859 | @@ -1,7 +1,7 @@ |
860 | #!/usr/bin/python |
861 | |
862 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
863 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
864 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
865 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
866 | |
867 | # This program is free software: you can redistribute it and/or modify |
868 | # it under the terms of the GNU General Public License as published by |
869 | |
870 | === modified file 'data/templates/libkkc-data/tools/sortlm.py' |
871 | --- data/templates/libkkc-data/tools/sortlm.py 2014-02-26 22:51:39 +0000 |
872 | +++ data/templates/libkkc-data/tools/sortlm.py 2014-10-01 15:12:30 +0000 |
873 | @@ -1,7 +1,7 @@ |
874 | #!/usr/bin/python |
875 | |
876 | -# Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
877 | -# Copyright (C) 2011-2013 Red Hat, Inc. |
878 | +# Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
879 | +# Copyright (C) 2011-2014 Red Hat, Inc. |
880 | |
881 | # This program is free software: you can redistribute it and/or modify |
882 | # it under the terms of the GNU General Public License as published by |
883 | |
884 | === modified file 'debian/changelog' |
885 | --- debian/changelog 2014-06-15 23:27:57 +0000 |
886 | +++ debian/changelog 2014-10-01 15:12:30 +0000 |
887 | @@ -1,3 +1,10 @@ |
888 | +libkkc (0.3.4-0ubuntu1) utopic; urgency=medium |
889 | + |
890 | + * New upstream release. |
891 | + * Change Build-Depends from libgee-dev to libgee-0.8-dev (LP: #1374949) |
892 | + |
893 | + -- Mitsuya Shibata <mty.shibata@gmail.com> Wed, 01 Oct 2014 23:33:01 +0900 |
894 | + |
895 | libkkc (0.3.3-1) unstable; urgency=medium |
896 | |
897 | * New upstream release. |
898 | |
899 | === modified file 'debian/control' |
900 | --- debian/control 2014-06-15 23:27:57 +0000 |
901 | +++ debian/control 2014-10-01 15:12:30 +0000 |
902 | @@ -1,13 +1,14 @@ |
903 | Source: libkkc |
904 | Priority: extra |
905 | -Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org> |
906 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
907 | +XSBC-Original-Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org> |
908 | Uploaders: Mitsuya Shibata <mty.shibata@gmail.com>, |
909 | Osamu Aoki <osamu@debian.org> |
910 | Build-Depends: dh-autoreconf, |
911 | debhelper (>= 9), |
912 | gobject-introspection, |
913 | intltool, |
914 | - libgee-dev, |
915 | + libgee-0.8-dev, |
916 | libgirepository1.0-dev, |
917 | libglib2.0-dev, |
918 | libjson-glib-dev, |
919 | |
920 | === modified file 'docs/Makefile.am' |
921 | --- docs/Makefile.am 2014-06-15 23:27:57 +0000 |
922 | +++ docs/Makefile.am 2014-10-01 15:12:30 +0000 |
923 | @@ -53,7 +53,7 @@ |
924 | config \ |
925 | glib-2.0 \ |
926 | gio-2.0 \ |
927 | - gee-1.0 \ |
928 | + gee-0.8 \ |
929 | posix \ |
930 | json-glib-1.0 \ |
931 | marisa-glib \ |
932 | |
933 | === modified file 'docs/Makefile.in' |
934 | --- docs/Makefile.in 2014-06-15 23:27:57 +0000 |
935 | +++ docs/Makefile.in 2014-10-01 15:12:30 +0000 |
936 | @@ -385,7 +385,7 @@ |
937 | config \ |
938 | glib-2.0 \ |
939 | gio-2.0 \ |
940 | - gee-1.0 \ |
941 | + gee-0.8 \ |
942 | posix \ |
943 | json-glib-1.0 \ |
944 | marisa-glib \ |
945 | |
946 | === modified file 'libkkc/Kkc-1.0.gir' |
947 | --- libkkc/Kkc-1.0.gir 2014-06-15 23:27:57 +0000 |
948 | +++ libkkc/Kkc-1.0.gir 2014-10-01 15:12:30 +0000 |
949 | @@ -3,7 +3,7 @@ |
950 | <include name="GObject" version="2.0"/> |
951 | <include name="Gio" version="2.0"/> |
952 | <include name="Json" version="1.0"/> |
953 | -<include name="Gee" version="1.0"/> |
954 | +<include name="Gee" version="0.8"/> |
955 | <package name="kkc-1.0"/> |
956 | <c:include name="libkkc/libkkc.h"/> |
957 | <namespace name="Kkc" version="1.0" c:prefix="Kkc"> |
958 | @@ -8592,7 +8592,7 @@ |
959 | <parameter name="type" transfer-ownership="none" allow-none="1"> |
960 | <type name="GObject.Type" c:type="GType*"/> |
961 | </parameter> |
962 | - <parameter name="callback" transfer-ownership="none" closure="2"> |
963 | + <parameter name="callback" transfer-ownership="none" closure="2" scope="call"> |
964 | <type name="Kkc.DictionaryListDictionaryCallback" c:type="KkcDictionaryListDictionaryCallback"/> |
965 | </parameter> |
966 | <parameter name="callback_target" transfer-ownership="none" allow-none="1"> |
967 | |
968 | === modified file 'libkkc/Makefile.am' |
969 | --- libkkc/Makefile.am 2014-06-15 23:27:57 +0000 |
970 | +++ libkkc/Makefile.am 2014-10-01 15:12:30 +0000 |
971 | @@ -1,5 +1,5 @@ |
972 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
973 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
974 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
975 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
976 | |
977 | # This program is free software: you can redistribute it and/or modify |
978 | # it under the terms of the GNU General Public License as published by |
979 | @@ -31,7 +31,7 @@ |
980 | --pkg keysyms \ |
981 | --pkg glib-2.0 \ |
982 | --pkg gio-2.0 \ |
983 | - --pkg gee-1.0 \ |
984 | + --pkg gee-0.8 \ |
985 | --pkg json-glib-1.0 \ |
986 | --pkg marisa-glib \ |
987 | --internal-vapi kkc-internals-@KKC_API_VERSION@.vapi \ |
988 | |
989 | === modified file 'libkkc/Makefile.in' |
990 | --- libkkc/Makefile.in 2014-06-15 23:27:57 +0000 |
991 | +++ libkkc/Makefile.in 2014-10-01 15:12:30 +0000 |
992 | @@ -14,8 +14,8 @@ |
993 | |
994 | @SET_MAKE@ |
995 | |
996 | -# Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
997 | -# Copyright (C) 2012-2013 Red Hat, Inc. |
998 | +# Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
999 | +# Copyright (C) 2012-2014 Red Hat, Inc. |
1000 | |
1001 | # This program is free software: you can redistribute it and/or modify |
1002 | # it under the terms of the GNU General Public License as published by |
1003 | @@ -485,7 +485,7 @@ |
1004 | --pkg keysyms \ |
1005 | --pkg glib-2.0 \ |
1006 | --pkg gio-2.0 \ |
1007 | - --pkg gee-1.0 \ |
1008 | + --pkg gee-0.8 \ |
1009 | --pkg json-glib-1.0 \ |
1010 | --pkg marisa-glib \ |
1011 | --internal-vapi kkc-internals-@KKC_API_VERSION@.vapi \ |
1012 | |
1013 | === modified file 'libkkc/bigram-decoder.c' |
1014 | --- libkkc/bigram-decoder.c 2014-06-15 23:27:57 +0000 |
1015 | +++ libkkc/bigram-decoder.c 2014-10-01 15:12:30 +0000 |
1016 | @@ -1,9 +1,9 @@ |
1017 | -/* bigram-decoder.c generated by valac 0.22.1, the Vala compiler |
1018 | +/* bigram-decoder.c generated by valac 0.24.0.131-42e78, the Vala compiler |
1019 | * generated from bigram-decoder.vala, do not modify */ |
1020 | |
1021 | /* |
1022 | - * Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
1023 | - * Copyright (C) 2012-2013 Red Hat, Inc. |
1024 | + * Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
1025 | + * Copyright (C) 2012-2014 Red Hat, Inc. |
1026 | * |
1027 | * This program is free software: you can redistribute it and/or modify |
1028 | * it under the terms of the GNU General Public License as published by |
1029 | @@ -290,6 +290,7 @@ |
1030 | KkcSegment* kkc_segment_construct (GType object_type, const gchar* input, const gchar* output); |
1031 | static gboolean _kkc_language_model_entry_equal (const KkcLanguageModelEntry* s1, const KkcLanguageModelEntry* s2); |
1032 | static gint kkc_bigram_decoder_compare_nbest_node (KkcNbestNode* a, KkcNbestNode* b); |
1033 | +static gint _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); |
1034 | static gchar* kkc_bigram_decoder_concat_nbest_node_outputs (KkcBigramDecoder* self, KkcNbestNode* nbest_node); |
1035 | guint kkc_trellis_node_get_endpos (KkcTrellisNode* self); |
1036 | const gchar* kkc_trellis_node_get_output (KkcTrellisNode* self); |
1037 | @@ -438,15 +439,13 @@ |
1038 | |
1039 | static void kkc_nbest_node_class_init (KkcNbestNodeClass * klass) { |
1040 | kkc_nbest_node_parent_class = g_type_class_peek_parent (klass); |
1041 | - KKC_NBEST_NODE_CLASS (klass)->finalize = kkc_nbest_node_finalize; |
1042 | + ((KkcNbestNodeClass *) klass)->finalize = kkc_nbest_node_finalize; |
1043 | } |
1044 | |
1045 | |
1046 | static void kkc_nbest_node_instance_init (KkcNbestNode * self) { |
1047 | - gdouble _tmp0_ = 0.0; |
1048 | self->gn = 0.0; |
1049 | - _tmp0_ = DBL_MAX; |
1050 | - self->fn = _tmp0_; |
1051 | + self->fn = DBL_MAX; |
1052 | self->ref_count = 1; |
1053 | } |
1054 | |
1055 | @@ -454,6 +453,7 @@ |
1056 | static void kkc_nbest_node_finalize (KkcNbestNode* obj) { |
1057 | KkcNbestNode * self; |
1058 | self = G_TYPE_CHECK_INSTANCE_CAST (obj, KKC_TYPE_NBEST_NODE, KkcNbestNode); |
1059 | + g_signal_handlers_destroy (self); |
1060 | _kkc_trellis_node_unref0 (self->node); |
1061 | _kkc_nbest_node_unref0 (self->next); |
1062 | } |
1063 | @@ -498,27 +498,23 @@ |
1064 | gint _tmp1_ = 0; |
1065 | gint* _tmp2_ = NULL; |
1066 | gint _tmp2__length1 = 0; |
1067 | - gdouble _tmp3_ = 0.0; |
1068 | - gdouble _tmp4_ = 0.0; |
1069 | - gint _tmp5_ = 0; |
1070 | - KkcSegment** _tmp6_ = NULL; |
1071 | - KkcSegment** _tmp7_ = NULL; |
1072 | - gint _tmp7__length1 = 0; |
1073 | + gint _tmp3_ = 0; |
1074 | + KkcSegment** _tmp4_ = NULL; |
1075 | + KkcSegment** _tmp5_ = NULL; |
1076 | + gint _tmp5__length1 = 0; |
1077 | self = (KkcBigramDecoder*) base; |
1078 | g_return_val_if_fail (input != NULL, NULL); |
1079 | _tmp0_ = input; |
1080 | _tmp1_ = nbest; |
1081 | _tmp2_ = constraint; |
1082 | _tmp2__length1 = constraint_length1; |
1083 | - _tmp3_ = DBL_MAX; |
1084 | - _tmp4_ = DBL_MAX; |
1085 | - _tmp6_ = kkc_decoder_decode_with_costs ((KkcDecoder*) self, _tmp0_, _tmp1_, _tmp2_, _tmp2__length1, _tmp3_, -_tmp4_, &_tmp5_); |
1086 | - _tmp7_ = _tmp6_; |
1087 | - _tmp7__length1 = _tmp5_; |
1088 | + _tmp4_ = kkc_decoder_decode_with_costs ((KkcDecoder*) self, _tmp0_, _tmp1_, _tmp2_, _tmp2__length1, DBL_MAX, -DBL_MAX, &_tmp3_); |
1089 | + _tmp5_ = _tmp4_; |
1090 | + _tmp5__length1 = _tmp3_; |
1091 | if (result_length1) { |
1092 | - *result_length1 = _tmp7__length1; |
1093 | + *result_length1 = _tmp5__length1; |
1094 | } |
1095 | - result = _tmp7_; |
1096 | + result = _tmp5_; |
1097 | return result; |
1098 | } |
1099 | |
1100 | @@ -552,8 +548,8 @@ |
1101 | KkcSegment** _tmp14_ = NULL; |
1102 | gint segments_length1 = 0; |
1103 | gint _segments_size_ = 0; |
1104 | - KkcSegment** _tmp23_ = NULL; |
1105 | - gint _tmp23__length1 = 0; |
1106 | + KkcSegment** _tmp22_ = NULL; |
1107 | + gint _tmp22__length1 = 0; |
1108 | self = (KkcBigramDecoder*) base; |
1109 | g_return_val_if_fail (input != NULL, NULL); |
1110 | _tmp0_ = input; |
1111 | @@ -589,41 +585,39 @@ |
1112 | gboolean _tmp15_ = FALSE; |
1113 | _tmp15_ = TRUE; |
1114 | while (TRUE) { |
1115 | - gboolean _tmp16_ = FALSE; |
1116 | - gint _tmp18_ = 0; |
1117 | + gint _tmp17_ = 0; |
1118 | + GeeArrayList** _tmp18_ = NULL; |
1119 | + gint _tmp18__length1 = 0; |
1120 | GeeArrayList** _tmp19_ = NULL; |
1121 | gint _tmp19__length1 = 0; |
1122 | - GeeArrayList** _tmp20_ = NULL; |
1123 | - gint _tmp20__length1 = 0; |
1124 | - gint _tmp21_ = 0; |
1125 | - GeeArrayList* _tmp22_ = NULL; |
1126 | - _tmp16_ = _tmp15_; |
1127 | - if (!_tmp16_) { |
1128 | - gint _tmp17_ = 0; |
1129 | - _tmp17_ = i; |
1130 | - i = _tmp17_ + 1; |
1131 | + gint _tmp20_ = 0; |
1132 | + GeeArrayList* _tmp21_ = NULL; |
1133 | + if (!_tmp15_) { |
1134 | + gint _tmp16_ = 0; |
1135 | + _tmp16_ = i; |
1136 | + i = _tmp16_ + 1; |
1137 | } |
1138 | _tmp15_ = FALSE; |
1139 | - _tmp18_ = i; |
1140 | + _tmp17_ = i; |
1141 | + _tmp18_ = trellis; |
1142 | + _tmp18__length1 = trellis_length1; |
1143 | + if (!(_tmp17_ < _tmp18__length1)) { |
1144 | + break; |
1145 | + } |
1146 | _tmp19_ = trellis; |
1147 | _tmp19__length1 = trellis_length1; |
1148 | - if (!(_tmp18_ < _tmp19__length1)) { |
1149 | - break; |
1150 | - } |
1151 | - _tmp20_ = trellis; |
1152 | - _tmp20__length1 = trellis_length1; |
1153 | - _tmp21_ = i; |
1154 | - _tmp22_ = _tmp20_[_tmp21_]; |
1155 | - gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp22_); |
1156 | + _tmp20_ = i; |
1157 | + _tmp21_ = _tmp19_[_tmp20_]; |
1158 | + gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp21_); |
1159 | } |
1160 | } |
1161 | } |
1162 | - _tmp23_ = segments; |
1163 | - _tmp23__length1 = segments_length1; |
1164 | + _tmp22_ = segments; |
1165 | + _tmp22__length1 = segments_length1; |
1166 | if (result_length1) { |
1167 | - *result_length1 = _tmp23__length1; |
1168 | + *result_length1 = _tmp22__length1; |
1169 | } |
1170 | - result = _tmp23_; |
1171 | + result = _tmp22_; |
1172 | trellis = (_vala_array_free (trellis, trellis_length1, (GDestroyNotify) g_object_unref), NULL); |
1173 | return result; |
1174 | } |
1175 | @@ -674,15 +668,14 @@ |
1176 | glong string_length = 0L; |
1177 | gboolean _tmp0_ = FALSE; |
1178 | glong _tmp1_ = 0L; |
1179 | - gboolean _tmp3_ = FALSE; |
1180 | - glong _tmp9_ = 0L; |
1181 | - glong _tmp15_ = 0L; |
1182 | + glong _tmp8_ = 0L; |
1183 | + glong _tmp14_ = 0L; |
1184 | + glong _tmp17_ = 0L; |
1185 | glong _tmp18_ = 0L; |
1186 | glong _tmp19_ = 0L; |
1187 | glong _tmp20_ = 0L; |
1188 | glong _tmp21_ = 0L; |
1189 | - glong _tmp22_ = 0L; |
1190 | - gchar* _tmp23_ = NULL; |
1191 | + gchar* _tmp22_ = NULL; |
1192 | g_return_val_if_fail (self != NULL, NULL); |
1193 | _tmp1_ = offset; |
1194 | if (_tmp1_ >= ((glong) 0)) { |
1195 | @@ -692,55 +685,54 @@ |
1196 | } else { |
1197 | _tmp0_ = FALSE; |
1198 | } |
1199 | - _tmp3_ = _tmp0_; |
1200 | - if (_tmp3_) { |
1201 | + if (_tmp0_) { |
1202 | + glong _tmp3_ = 0L; |
1203 | glong _tmp4_ = 0L; |
1204 | glong _tmp5_ = 0L; |
1205 | - glong _tmp6_ = 0L; |
1206 | - _tmp4_ = offset; |
1207 | - _tmp5_ = len; |
1208 | - _tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_); |
1209 | - string_length = _tmp6_; |
1210 | + _tmp3_ = offset; |
1211 | + _tmp4_ = len; |
1212 | + _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); |
1213 | + string_length = _tmp5_; |
1214 | } else { |
1215 | + gint _tmp6_ = 0; |
1216 | gint _tmp7_ = 0; |
1217 | - gint _tmp8_ = 0; |
1218 | - _tmp7_ = strlen (self); |
1219 | - _tmp8_ = _tmp7_; |
1220 | - string_length = (glong) _tmp8_; |
1221 | + _tmp6_ = strlen (self); |
1222 | + _tmp7_ = _tmp6_; |
1223 | + string_length = (glong) _tmp7_; |
1224 | } |
1225 | - _tmp9_ = offset; |
1226 | - if (_tmp9_ < ((glong) 0)) { |
1227 | + _tmp8_ = offset; |
1228 | + if (_tmp8_ < ((glong) 0)) { |
1229 | + glong _tmp9_ = 0L; |
1230 | glong _tmp10_ = 0L; |
1231 | glong _tmp11_ = 0L; |
1232 | + _tmp9_ = string_length; |
1233 | + _tmp10_ = offset; |
1234 | + offset = _tmp9_ + _tmp10_; |
1235 | + _tmp11_ = offset; |
1236 | + g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); |
1237 | + } else { |
1238 | glong _tmp12_ = 0L; |
1239 | - _tmp10_ = string_length; |
1240 | - _tmp11_ = offset; |
1241 | - offset = _tmp10_ + _tmp11_; |
1242 | + glong _tmp13_ = 0L; |
1243 | _tmp12_ = offset; |
1244 | - g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL); |
1245 | - } else { |
1246 | - glong _tmp13_ = 0L; |
1247 | - glong _tmp14_ = 0L; |
1248 | - _tmp13_ = offset; |
1249 | - _tmp14_ = string_length; |
1250 | - g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL); |
1251 | + _tmp13_ = string_length; |
1252 | + g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); |
1253 | } |
1254 | - _tmp15_ = len; |
1255 | - if (_tmp15_ < ((glong) 0)) { |
1256 | + _tmp14_ = len; |
1257 | + if (_tmp14_ < ((glong) 0)) { |
1258 | + glong _tmp15_ = 0L; |
1259 | glong _tmp16_ = 0L; |
1260 | - glong _tmp17_ = 0L; |
1261 | - _tmp16_ = string_length; |
1262 | - _tmp17_ = offset; |
1263 | - len = _tmp16_ - _tmp17_; |
1264 | + _tmp15_ = string_length; |
1265 | + _tmp16_ = offset; |
1266 | + len = _tmp15_ - _tmp16_; |
1267 | } |
1268 | - _tmp18_ = offset; |
1269 | - _tmp19_ = len; |
1270 | - _tmp20_ = string_length; |
1271 | - g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL); |
1272 | - _tmp21_ = offset; |
1273 | - _tmp22_ = len; |
1274 | - _tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_); |
1275 | - result = _tmp23_; |
1276 | + _tmp17_ = offset; |
1277 | + _tmp18_ = len; |
1278 | + _tmp19_ = string_length; |
1279 | + g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); |
1280 | + _tmp20_ = offset; |
1281 | + _tmp21_ = len; |
1282 | + _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); |
1283 | + result = _tmp22_; |
1284 | return result; |
1285 | } |
1286 | |
1287 | @@ -755,145 +747,139 @@ |
1288 | gboolean _tmp0_ = FALSE; |
1289 | _tmp0_ = TRUE; |
1290 | while (TRUE) { |
1291 | - gboolean _tmp1_ = FALSE; |
1292 | - gint _tmp3_ = 0; |
1293 | - GeeArrayList** _tmp4_ = NULL; |
1294 | - gint _tmp4__length1 = 0; |
1295 | - _tmp1_ = _tmp0_; |
1296 | - if (!_tmp1_) { |
1297 | - gint _tmp2_ = 0; |
1298 | - _tmp2_ = i; |
1299 | - i = _tmp2_ + 1; |
1300 | + gint _tmp2_ = 0; |
1301 | + GeeArrayList** _tmp3_ = NULL; |
1302 | + gint _tmp3__length1 = 0; |
1303 | + if (!_tmp0_) { |
1304 | + gint _tmp1_ = 0; |
1305 | + _tmp1_ = i; |
1306 | + i = _tmp1_ + 1; |
1307 | } |
1308 | _tmp0_ = FALSE; |
1309 | - _tmp3_ = i; |
1310 | - _tmp4_ = trellis; |
1311 | - _tmp4__length1 = trellis_length1; |
1312 | - if (!(_tmp3_ < _tmp4__length1)) { |
1313 | + _tmp2_ = i; |
1314 | + _tmp3_ = trellis; |
1315 | + _tmp3__length1 = trellis_length1; |
1316 | + if (!(_tmp2_ < _tmp3__length1)) { |
1317 | break; |
1318 | } |
1319 | { |
1320 | gint j = 0; |
1321 | - gint _tmp5_ = 0; |
1322 | - _tmp5_ = i; |
1323 | - j = _tmp5_; |
1324 | + gint _tmp4_ = 0; |
1325 | + _tmp4_ = i; |
1326 | + j = _tmp4_; |
1327 | { |
1328 | - gboolean _tmp6_ = FALSE; |
1329 | - _tmp6_ = TRUE; |
1330 | + gboolean _tmp5_ = FALSE; |
1331 | + _tmp5_ = TRUE; |
1332 | while (TRUE) { |
1333 | gboolean _tmp7_ = FALSE; |
1334 | - gboolean _tmp9_ = FALSE; |
1335 | - gint _tmp10_ = 0; |
1336 | - GeeArrayList** _tmp11_ = NULL; |
1337 | - gint _tmp11__length1 = 0; |
1338 | - gboolean _tmp17_ = FALSE; |
1339 | - gint* _tmp18_ = NULL; |
1340 | - gint _tmp18__length1 = 0; |
1341 | - gint _tmp19_ = 0; |
1342 | + gint _tmp8_ = 0; |
1343 | + GeeArrayList** _tmp9_ = NULL; |
1344 | + gint _tmp9__length1 = 0; |
1345 | + gint* _tmp15_ = NULL; |
1346 | + gint _tmp15__length1 = 0; |
1347 | + gint _tmp16_ = 0; |
1348 | + gint _tmp17_ = 0; |
1349 | + gboolean _tmp18_ = FALSE; |
1350 | + glong offset = 0L; |
1351 | + const gchar* _tmp19_ = NULL; |
1352 | gint _tmp20_ = 0; |
1353 | - gboolean _tmp21_ = FALSE; |
1354 | - glong offset = 0L; |
1355 | + gint _tmp21_ = 0; |
1356 | + glong length = 0L; |
1357 | const gchar* _tmp22_ = NULL; |
1358 | gint _tmp23_ = 0; |
1359 | gint _tmp24_ = 0; |
1360 | - glong length = 0L; |
1361 | - const gchar* _tmp25_ = NULL; |
1362 | - gint _tmp26_ = 0; |
1363 | - gint _tmp27_ = 0; |
1364 | + glong _tmp25_ = 0L; |
1365 | + gchar* _input = NULL; |
1366 | + const gchar* _tmp26_ = NULL; |
1367 | + glong _tmp27_ = 0L; |
1368 | glong _tmp28_ = 0L; |
1369 | - gchar* _input = NULL; |
1370 | - const gchar* _tmp29_ = NULL; |
1371 | - glong _tmp30_ = 0L; |
1372 | - glong _tmp31_ = 0L; |
1373 | - gchar* _tmp32_ = NULL; |
1374 | + gchar* _tmp29_ = NULL; |
1375 | KkcLanguageModelEntry entry = {0}; |
1376 | - const gchar* _tmp33_ = NULL; |
1377 | - gchar* _tmp34_ = NULL; |
1378 | - const gchar* _tmp35_ = NULL; |
1379 | - gchar* _tmp36_ = NULL; |
1380 | - KkcLanguageModelEntry _tmp37_ = {0}; |
1381 | + const gchar* _tmp30_ = NULL; |
1382 | + gchar* _tmp31_ = NULL; |
1383 | + const gchar* _tmp32_ = NULL; |
1384 | + gchar* _tmp33_ = NULL; |
1385 | + KkcLanguageModelEntry _tmp34_ = {0}; |
1386 | KkcUnigramTrellisNode* node = NULL; |
1387 | - KkcLanguageModelEntry _tmp38_ = {0}; |
1388 | + KkcLanguageModelEntry _tmp35_ = {0}; |
1389 | + gint _tmp36_ = 0; |
1390 | + KkcUnigramTrellisNode* _tmp37_ = NULL; |
1391 | + GeeArrayList** _tmp38_ = NULL; |
1392 | + gint _tmp38__length1 = 0; |
1393 | gint _tmp39_ = 0; |
1394 | - KkcUnigramTrellisNode* _tmp40_ = NULL; |
1395 | - GeeArrayList** _tmp41_ = NULL; |
1396 | - gint _tmp41__length1 = 0; |
1397 | - gint _tmp42_ = 0; |
1398 | - GeeArrayList* _tmp43_ = NULL; |
1399 | - KkcUnigramTrellisNode* _tmp44_ = NULL; |
1400 | - _tmp7_ = _tmp6_; |
1401 | + GeeArrayList* _tmp40_ = NULL; |
1402 | + KkcUnigramTrellisNode* _tmp41_ = NULL; |
1403 | + if (!_tmp5_) { |
1404 | + gint _tmp6_ = 0; |
1405 | + _tmp6_ = j; |
1406 | + j = _tmp6_ + 1; |
1407 | + } |
1408 | + _tmp5_ = FALSE; |
1409 | + _tmp8_ = j; |
1410 | + _tmp9_ = trellis; |
1411 | + _tmp9__length1 = trellis_length1; |
1412 | + if (_tmp8_ < _tmp9__length1) { |
1413 | + GeeArrayList** _tmp10_ = NULL; |
1414 | + gint _tmp10__length1 = 0; |
1415 | + gint _tmp11_ = 0; |
1416 | + GeeArrayList* _tmp12_ = NULL; |
1417 | + gboolean _tmp13_ = FALSE; |
1418 | + gboolean _tmp14_ = FALSE; |
1419 | + _tmp10_ = trellis; |
1420 | + _tmp10__length1 = trellis_length1; |
1421 | + _tmp11_ = j; |
1422 | + _tmp12_ = _tmp10_[_tmp11_]; |
1423 | + _tmp13_ = gee_collection_get_is_empty ((GeeCollection*) _tmp12_); |
1424 | + _tmp14_ = _tmp13_; |
1425 | + _tmp7_ = _tmp14_; |
1426 | + } else { |
1427 | + _tmp7_ = FALSE; |
1428 | + } |
1429 | if (!_tmp7_) { |
1430 | - gint _tmp8_ = 0; |
1431 | - _tmp8_ = j; |
1432 | - j = _tmp8_ + 1; |
1433 | - } |
1434 | - _tmp6_ = FALSE; |
1435 | - _tmp10_ = j; |
1436 | - _tmp11_ = trellis; |
1437 | - _tmp11__length1 = trellis_length1; |
1438 | - if (_tmp10_ < _tmp11__length1) { |
1439 | - GeeArrayList** _tmp12_ = NULL; |
1440 | - gint _tmp12__length1 = 0; |
1441 | - gint _tmp13_ = 0; |
1442 | - GeeArrayList* _tmp14_ = NULL; |
1443 | - gboolean _tmp15_ = FALSE; |
1444 | - gboolean _tmp16_ = FALSE; |
1445 | - _tmp12_ = trellis; |
1446 | - _tmp12__length1 = trellis_length1; |
1447 | - _tmp13_ = j; |
1448 | - _tmp14_ = _tmp12_[_tmp13_]; |
1449 | - _tmp15_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp14_); |
1450 | - _tmp16_ = _tmp15_; |
1451 | - _tmp9_ = _tmp16_; |
1452 | - } else { |
1453 | - _tmp9_ = FALSE; |
1454 | - } |
1455 | - _tmp17_ = _tmp9_; |
1456 | - if (!_tmp17_) { |
1457 | break; |
1458 | } |
1459 | - _tmp18_ = constraint; |
1460 | - _tmp18__length1 = constraint_length1; |
1461 | - _tmp19_ = i; |
1462 | - _tmp20_ = j; |
1463 | - _tmp21_ = kkc_bigram_decoder_check_overlaps (self, _tmp18_, _tmp18__length1, _tmp19_, _tmp20_); |
1464 | - if (!_tmp21_) { |
1465 | + _tmp15_ = constraint; |
1466 | + _tmp15__length1 = constraint_length1; |
1467 | + _tmp16_ = i; |
1468 | + _tmp17_ = j; |
1469 | + _tmp18_ = kkc_bigram_decoder_check_overlaps (self, _tmp15_, _tmp15__length1, _tmp16_, _tmp17_); |
1470 | + if (!_tmp18_) { |
1471 | continue; |
1472 | } |
1473 | + _tmp19_ = input; |
1474 | + _tmp20_ = i; |
1475 | + _tmp21_ = string_index_of_nth_char (_tmp19_, (glong) (_tmp20_ - 1)); |
1476 | + offset = (glong) _tmp21_; |
1477 | _tmp22_ = input; |
1478 | - _tmp23_ = i; |
1479 | - _tmp24_ = string_index_of_nth_char (_tmp22_, (glong) (_tmp23_ - 1)); |
1480 | - offset = (glong) _tmp24_; |
1481 | - _tmp25_ = input; |
1482 | - _tmp26_ = j; |
1483 | - _tmp27_ = string_index_of_nth_char (_tmp25_, (glong) _tmp26_); |
1484 | - _tmp28_ = offset; |
1485 | - length = _tmp27_ - _tmp28_; |
1486 | - _tmp29_ = input; |
1487 | - _tmp30_ = offset; |
1488 | - _tmp31_ = length; |
1489 | - _tmp32_ = string_substring (_tmp29_, _tmp30_, _tmp31_); |
1490 | - _input = _tmp32_; |
1491 | - _tmp33_ = _input; |
1492 | - _tmp34_ = g_strdup (_tmp33_); |
1493 | - _tmp35_ = _input; |
1494 | - _tmp36_ = g_strdup (_tmp35_); |
1495 | - _g_free0 (_tmp37_.input); |
1496 | - _tmp37_.input = _tmp34_; |
1497 | - _g_free0 (_tmp37_.output); |
1498 | - _tmp37_.output = _tmp36_; |
1499 | - _tmp37_.id = (guint) 2; |
1500 | - entry = _tmp37_; |
1501 | - _tmp38_ = entry; |
1502 | + _tmp23_ = j; |
1503 | + _tmp24_ = string_index_of_nth_char (_tmp22_, (glong) _tmp23_); |
1504 | + _tmp25_ = offset; |
1505 | + length = _tmp24_ - _tmp25_; |
1506 | + _tmp26_ = input; |
1507 | + _tmp27_ = offset; |
1508 | + _tmp28_ = length; |
1509 | + _tmp29_ = string_substring (_tmp26_, _tmp27_, _tmp28_); |
1510 | + _input = _tmp29_; |
1511 | + _tmp30_ = _input; |
1512 | + _tmp31_ = g_strdup (_tmp30_); |
1513 | + _tmp32_ = _input; |
1514 | + _tmp33_ = g_strdup (_tmp32_); |
1515 | + _g_free0 (_tmp34_.input); |
1516 | + _tmp34_.input = _tmp31_; |
1517 | + _g_free0 (_tmp34_.output); |
1518 | + _tmp34_.output = _tmp33_; |
1519 | + _tmp34_.id = (guint) 2; |
1520 | + entry = _tmp34_; |
1521 | + _tmp35_ = entry; |
1522 | + _tmp36_ = j; |
1523 | + _tmp37_ = kkc_unigram_trellis_node_new (&_tmp35_, (guint) _tmp36_); |
1524 | + node = _tmp37_; |
1525 | + _tmp38_ = trellis; |
1526 | + _tmp38__length1 = trellis_length1; |
1527 | _tmp39_ = j; |
1528 | - _tmp40_ = kkc_unigram_trellis_node_new (&_tmp38_, (guint) _tmp39_); |
1529 | - node = _tmp40_; |
1530 | - _tmp41_ = trellis; |
1531 | - _tmp41__length1 = trellis_length1; |
1532 | - _tmp42_ = j; |
1533 | - _tmp43_ = _tmp41_[_tmp42_]; |
1534 | - _tmp44_ = node; |
1535 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp43_, (KkcTrellisNode*) _tmp44_); |
1536 | + _tmp40_ = _tmp38_[_tmp39_]; |
1537 | + _tmp41_ = node; |
1538 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp40_, (KkcTrellisNode*) _tmp41_); |
1539 | _kkc_trellis_node_unref0 (node); |
1540 | kkc_language_model_entry_destroy (&entry); |
1541 | _g_free0 (_input); |
1542 | @@ -917,29 +903,29 @@ |
1543 | gint trellis_length1 = 0; |
1544 | gint _trellis_size_ = 0; |
1545 | KkcUnigramTrellisNode* bos_node = NULL; |
1546 | + KkcBigramLanguageModel* _tmp12_ = NULL; |
1547 | KkcBigramLanguageModel* _tmp13_ = NULL; |
1548 | - KkcBigramLanguageModel* _tmp14_ = NULL; |
1549 | + KkcLanguageModelEntry _tmp14_ = {0}; |
1550 | KkcLanguageModelEntry _tmp15_ = {0}; |
1551 | - KkcLanguageModelEntry _tmp16_ = {0}; |
1552 | - KkcUnigramTrellisNode* _tmp17_ = NULL; |
1553 | - GeeArrayList** _tmp18_ = NULL; |
1554 | - gint _tmp18__length1 = 0; |
1555 | - GeeArrayList* _tmp19_ = NULL; |
1556 | - KkcUnigramTrellisNode* _tmp20_ = NULL; |
1557 | + KkcUnigramTrellisNode* _tmp16_ = NULL; |
1558 | + GeeArrayList** _tmp17_ = NULL; |
1559 | + gint _tmp17__length1 = 0; |
1560 | + GeeArrayList* _tmp18_ = NULL; |
1561 | + KkcUnigramTrellisNode* _tmp19_ = NULL; |
1562 | KkcUnigramTrellisNode* eos_node = NULL; |
1563 | + KkcBigramLanguageModel* _tmp20_ = NULL; |
1564 | KkcBigramLanguageModel* _tmp21_ = NULL; |
1565 | - KkcBigramLanguageModel* _tmp22_ = NULL; |
1566 | + KkcLanguageModelEntry _tmp22_ = {0}; |
1567 | KkcLanguageModelEntry _tmp23_ = {0}; |
1568 | - KkcLanguageModelEntry _tmp24_ = {0}; |
1569 | - gint _tmp25_ = 0; |
1570 | - KkcUnigramTrellisNode* _tmp26_ = NULL; |
1571 | - GeeArrayList** _tmp27_ = NULL; |
1572 | - gint _tmp27__length1 = 0; |
1573 | - gint _tmp28_ = 0; |
1574 | - GeeArrayList* _tmp29_ = NULL; |
1575 | - KkcUnigramTrellisNode* _tmp30_ = NULL; |
1576 | - GeeArrayList** _tmp68_ = NULL; |
1577 | - gint _tmp68__length1 = 0; |
1578 | + gint _tmp24_ = 0; |
1579 | + KkcUnigramTrellisNode* _tmp25_ = NULL; |
1580 | + GeeArrayList** _tmp26_ = NULL; |
1581 | + gint _tmp26__length1 = 0; |
1582 | + gint _tmp27_ = 0; |
1583 | + GeeArrayList* _tmp28_ = NULL; |
1584 | + KkcUnigramTrellisNode* _tmp29_ = NULL; |
1585 | + GeeArrayList** _tmp66_ = NULL; |
1586 | + gint _tmp66__length1 = 0; |
1587 | g_return_val_if_fail (self != NULL, NULL); |
1588 | g_return_val_if_fail (input != NULL, NULL); |
1589 | _tmp0_ = input; |
1590 | @@ -957,176 +943,172 @@ |
1591 | gboolean _tmp4_ = FALSE; |
1592 | _tmp4_ = TRUE; |
1593 | while (TRUE) { |
1594 | - gboolean _tmp5_ = FALSE; |
1595 | - gint _tmp7_ = 0; |
1596 | + gint _tmp6_ = 0; |
1597 | + GeeArrayList** _tmp7_ = NULL; |
1598 | + gint _tmp7__length1 = 0; |
1599 | GeeArrayList** _tmp8_ = NULL; |
1600 | gint _tmp8__length1 = 0; |
1601 | - GeeArrayList** _tmp9_ = NULL; |
1602 | - gint _tmp9__length1 = 0; |
1603 | - gint _tmp10_ = 0; |
1604 | + gint _tmp9_ = 0; |
1605 | + GeeArrayList* _tmp10_ = NULL; |
1606 | GeeArrayList* _tmp11_ = NULL; |
1607 | - GeeArrayList* _tmp12_ = NULL; |
1608 | - _tmp5_ = _tmp4_; |
1609 | - if (!_tmp5_) { |
1610 | - gint _tmp6_ = 0; |
1611 | - _tmp6_ = i; |
1612 | - i = _tmp6_ + 1; |
1613 | + if (!_tmp4_) { |
1614 | + gint _tmp5_ = 0; |
1615 | + _tmp5_ = i; |
1616 | + i = _tmp5_ + 1; |
1617 | } |
1618 | _tmp4_ = FALSE; |
1619 | - _tmp7_ = i; |
1620 | + _tmp6_ = i; |
1621 | + _tmp7_ = trellis; |
1622 | + _tmp7__length1 = trellis_length1; |
1623 | + if (!(_tmp6_ < _tmp7__length1)) { |
1624 | + break; |
1625 | + } |
1626 | _tmp8_ = trellis; |
1627 | _tmp8__length1 = trellis_length1; |
1628 | - if (!(_tmp7_ < _tmp8__length1)) { |
1629 | - break; |
1630 | - } |
1631 | - _tmp9_ = trellis; |
1632 | - _tmp9__length1 = trellis_length1; |
1633 | - _tmp10_ = i; |
1634 | - _tmp11_ = gee_array_list_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, NULL); |
1635 | - _g_object_unref0 (_tmp9_[_tmp10_]); |
1636 | - _tmp9_[_tmp10_] = _tmp11_; |
1637 | - _tmp12_ = _tmp9_[_tmp10_]; |
1638 | + _tmp9_ = i; |
1639 | + _tmp10_ = gee_array_list_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, NULL, NULL, NULL); |
1640 | + _g_object_unref0 (_tmp8_[_tmp9_]); |
1641 | + _tmp8_[_tmp9_] = _tmp10_; |
1642 | + _tmp11_ = _tmp8_[_tmp9_]; |
1643 | } |
1644 | } |
1645 | } |
1646 | - _tmp13_ = kkc_bigram_decoder_get_model (self); |
1647 | - _tmp14_ = _tmp13_; |
1648 | - kkc_language_model_get_bos ((KkcLanguageModel*) _tmp14_, &_tmp15_); |
1649 | - _tmp16_ = _tmp15_; |
1650 | - _tmp17_ = kkc_unigram_trellis_node_new (&_tmp16_, (guint) 1); |
1651 | - bos_node = _tmp17_; |
1652 | - _tmp18_ = trellis; |
1653 | - _tmp18__length1 = trellis_length1; |
1654 | - _tmp19_ = _tmp18_[0]; |
1655 | - _tmp20_ = bos_node; |
1656 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp19_, (KkcTrellisNode*) _tmp20_); |
1657 | - _tmp21_ = kkc_bigram_decoder_get_model (self); |
1658 | - _tmp22_ = _tmp21_; |
1659 | - kkc_language_model_get_eos ((KkcLanguageModel*) _tmp22_, &_tmp23_); |
1660 | - _tmp24_ = _tmp23_; |
1661 | - _tmp25_ = length; |
1662 | - _tmp26_ = kkc_unigram_trellis_node_new (&_tmp24_, (guint) (_tmp25_ + 1)); |
1663 | - eos_node = _tmp26_; |
1664 | - _tmp27_ = trellis; |
1665 | - _tmp27__length1 = trellis_length1; |
1666 | - _tmp28_ = length; |
1667 | - _tmp29_ = _tmp27_[_tmp28_ + 1]; |
1668 | - _tmp30_ = eos_node; |
1669 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp29_, (KkcTrellisNode*) _tmp30_); |
1670 | + _tmp12_ = kkc_bigram_decoder_get_model (self); |
1671 | + _tmp13_ = _tmp12_; |
1672 | + kkc_language_model_get_bos ((KkcLanguageModel*) _tmp13_, &_tmp14_); |
1673 | + _tmp15_ = _tmp14_; |
1674 | + _tmp16_ = kkc_unigram_trellis_node_new (&_tmp15_, (guint) 1); |
1675 | + bos_node = _tmp16_; |
1676 | + _tmp17_ = trellis; |
1677 | + _tmp17__length1 = trellis_length1; |
1678 | + _tmp18_ = _tmp17_[0]; |
1679 | + _tmp19_ = bos_node; |
1680 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp18_, (KkcTrellisNode*) _tmp19_); |
1681 | + _tmp20_ = kkc_bigram_decoder_get_model (self); |
1682 | + _tmp21_ = _tmp20_; |
1683 | + kkc_language_model_get_eos ((KkcLanguageModel*) _tmp21_, &_tmp22_); |
1684 | + _tmp23_ = _tmp22_; |
1685 | + _tmp24_ = length; |
1686 | + _tmp25_ = kkc_unigram_trellis_node_new (&_tmp23_, (guint) (_tmp24_ + 1)); |
1687 | + eos_node = _tmp25_; |
1688 | + _tmp26_ = trellis; |
1689 | + _tmp26__length1 = trellis_length1; |
1690 | + _tmp27_ = length; |
1691 | + _tmp28_ = _tmp26_[_tmp27_ + 1]; |
1692 | + _tmp29_ = eos_node; |
1693 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp28_, (KkcTrellisNode*) _tmp29_); |
1694 | { |
1695 | gint i = 0; |
1696 | i = 0; |
1697 | { |
1698 | - gboolean _tmp31_ = FALSE; |
1699 | - _tmp31_ = TRUE; |
1700 | + gboolean _tmp30_ = FALSE; |
1701 | + _tmp30_ = TRUE; |
1702 | while (TRUE) { |
1703 | - gboolean _tmp32_ = FALSE; |
1704 | - gint _tmp34_ = 0; |
1705 | + gint _tmp32_ = 0; |
1706 | + gint _tmp33_ = 0; |
1707 | + glong byte_offset = 0L; |
1708 | + const gchar* _tmp34_ = NULL; |
1709 | gint _tmp35_ = 0; |
1710 | - glong byte_offset = 0L; |
1711 | - const gchar* _tmp36_ = NULL; |
1712 | - gint _tmp37_ = 0; |
1713 | - gint _tmp38_ = 0; |
1714 | + gint _tmp36_ = 0; |
1715 | gchar* _input = NULL; |
1716 | - const gchar* _tmp39_ = NULL; |
1717 | - glong _tmp40_ = 0L; |
1718 | - gchar* _tmp41_ = NULL; |
1719 | + const gchar* _tmp37_ = NULL; |
1720 | + glong _tmp38_ = 0L; |
1721 | + gchar* _tmp39_ = NULL; |
1722 | GeeCollection* entries = NULL; |
1723 | - KkcBigramLanguageModel* _tmp42_ = NULL; |
1724 | - KkcBigramLanguageModel* _tmp43_ = NULL; |
1725 | - const gchar* _tmp44_ = NULL; |
1726 | - GeeCollection* _tmp45_ = NULL; |
1727 | - _tmp32_ = _tmp31_; |
1728 | - if (!_tmp32_) { |
1729 | - gint _tmp33_ = 0; |
1730 | - _tmp33_ = i; |
1731 | - i = _tmp33_ + 1; |
1732 | + KkcBigramLanguageModel* _tmp40_ = NULL; |
1733 | + KkcBigramLanguageModel* _tmp41_ = NULL; |
1734 | + const gchar* _tmp42_ = NULL; |
1735 | + GeeCollection* _tmp43_ = NULL; |
1736 | + if (!_tmp30_) { |
1737 | + gint _tmp31_ = 0; |
1738 | + _tmp31_ = i; |
1739 | + i = _tmp31_ + 1; |
1740 | } |
1741 | - _tmp31_ = FALSE; |
1742 | - _tmp34_ = i; |
1743 | - _tmp35_ = length; |
1744 | - if (!(_tmp34_ < _tmp35_)) { |
1745 | + _tmp30_ = FALSE; |
1746 | + _tmp32_ = i; |
1747 | + _tmp33_ = length; |
1748 | + if (!(_tmp32_ < _tmp33_)) { |
1749 | break; |
1750 | } |
1751 | - _tmp36_ = input; |
1752 | - _tmp37_ = i; |
1753 | - _tmp38_ = string_index_of_nth_char (_tmp36_, (glong) _tmp37_); |
1754 | - byte_offset = (glong) _tmp38_; |
1755 | - _tmp39_ = input; |
1756 | - _tmp40_ = byte_offset; |
1757 | - _tmp41_ = string_substring (_tmp39_, _tmp40_, (glong) (-1)); |
1758 | - _input = _tmp41_; |
1759 | - _tmp42_ = kkc_bigram_decoder_get_model (self); |
1760 | - _tmp43_ = _tmp42_; |
1761 | - _tmp44_ = _input; |
1762 | - _tmp45_ = kkc_language_model_entries ((KkcLanguageModel*) _tmp43_, _tmp44_); |
1763 | - entries = _tmp45_; |
1764 | + _tmp34_ = input; |
1765 | + _tmp35_ = i; |
1766 | + _tmp36_ = string_index_of_nth_char (_tmp34_, (glong) _tmp35_); |
1767 | + byte_offset = (glong) _tmp36_; |
1768 | + _tmp37_ = input; |
1769 | + _tmp38_ = byte_offset; |
1770 | + _tmp39_ = string_substring (_tmp37_, _tmp38_, (glong) (-1)); |
1771 | + _input = _tmp39_; |
1772 | + _tmp40_ = kkc_bigram_decoder_get_model (self); |
1773 | + _tmp41_ = _tmp40_; |
1774 | + _tmp42_ = _input; |
1775 | + _tmp43_ = kkc_language_model_entries ((KkcLanguageModel*) _tmp41_, _tmp42_); |
1776 | + entries = _tmp43_; |
1777 | { |
1778 | GeeIterator* _entry_it = NULL; |
1779 | - GeeCollection* _tmp46_ = NULL; |
1780 | - GeeIterator* _tmp47_ = NULL; |
1781 | - _tmp46_ = entries; |
1782 | - _tmp47_ = gee_iterable_iterator ((GeeIterable*) _tmp46_); |
1783 | - _entry_it = _tmp47_; |
1784 | + GeeCollection* _tmp44_ = NULL; |
1785 | + GeeIterator* _tmp45_ = NULL; |
1786 | + _tmp44_ = entries; |
1787 | + _tmp45_ = gee_iterable_iterator ((GeeIterable*) _tmp44_); |
1788 | + _entry_it = _tmp45_; |
1789 | while (TRUE) { |
1790 | + GeeIterator* _tmp46_ = NULL; |
1791 | + gboolean _tmp47_ = FALSE; |
1792 | + KkcLanguageModelEntry* entry = NULL; |
1793 | GeeIterator* _tmp48_ = NULL; |
1794 | - gboolean _tmp49_ = FALSE; |
1795 | - KkcLanguageModelEntry* entry = NULL; |
1796 | - GeeIterator* _tmp50_ = NULL; |
1797 | - gpointer _tmp51_ = NULL; |
1798 | + gpointer _tmp49_ = NULL; |
1799 | gint j = 0; |
1800 | - gint _tmp52_ = 0; |
1801 | - KkcLanguageModelEntry* _tmp53_ = NULL; |
1802 | - const gchar* _tmp54_ = NULL; |
1803 | + gint _tmp50_ = 0; |
1804 | + KkcLanguageModelEntry* _tmp51_ = NULL; |
1805 | + const gchar* _tmp52_ = NULL; |
1806 | + gint _tmp53_ = 0; |
1807 | + gint* _tmp54_ = NULL; |
1808 | + gint _tmp54__length1 = 0; |
1809 | gint _tmp55_ = 0; |
1810 | - gint* _tmp56_ = NULL; |
1811 | - gint _tmp56__length1 = 0; |
1812 | - gint _tmp57_ = 0; |
1813 | - gint _tmp58_ = 0; |
1814 | - gboolean _tmp59_ = FALSE; |
1815 | + gint _tmp56_ = 0; |
1816 | + gboolean _tmp57_ = FALSE; |
1817 | KkcUnigramTrellisNode* node = NULL; |
1818 | - KkcLanguageModelEntry* _tmp60_ = NULL; |
1819 | - gint _tmp61_ = 0; |
1820 | - KkcLanguageModelEntry _tmp62_ = {0}; |
1821 | - KkcUnigramTrellisNode* _tmp63_ = NULL; |
1822 | - GeeArrayList** _tmp64_ = NULL; |
1823 | - gint _tmp64__length1 = 0; |
1824 | - gint _tmp65_ = 0; |
1825 | - GeeArrayList* _tmp66_ = NULL; |
1826 | - KkcUnigramTrellisNode* _tmp67_ = NULL; |
1827 | + KkcLanguageModelEntry* _tmp58_ = NULL; |
1828 | + gint _tmp59_ = 0; |
1829 | + KkcLanguageModelEntry _tmp60_ = {0}; |
1830 | + KkcUnigramTrellisNode* _tmp61_ = NULL; |
1831 | + GeeArrayList** _tmp62_ = NULL; |
1832 | + gint _tmp62__length1 = 0; |
1833 | + gint _tmp63_ = 0; |
1834 | + GeeArrayList* _tmp64_ = NULL; |
1835 | + KkcUnigramTrellisNode* _tmp65_ = NULL; |
1836 | + _tmp46_ = _entry_it; |
1837 | + _tmp47_ = gee_iterator_next (_tmp46_); |
1838 | + if (!_tmp47_) { |
1839 | + break; |
1840 | + } |
1841 | _tmp48_ = _entry_it; |
1842 | - _tmp49_ = gee_iterator_next (_tmp48_); |
1843 | - if (!_tmp49_) { |
1844 | - break; |
1845 | - } |
1846 | - _tmp50_ = _entry_it; |
1847 | - _tmp51_ = gee_iterator_get (_tmp50_); |
1848 | - entry = (KkcLanguageModelEntry*) _tmp51_; |
1849 | - _tmp52_ = i; |
1850 | - _tmp53_ = entry; |
1851 | - _tmp54_ = (*_tmp53_).input; |
1852 | - _tmp55_ = g_utf8_strlen (_tmp54_, (gssize) (-1)); |
1853 | - j = _tmp52_ + _tmp55_; |
1854 | - _tmp56_ = constraint; |
1855 | - _tmp56__length1 = constraint_length1; |
1856 | - _tmp57_ = i; |
1857 | - _tmp58_ = j; |
1858 | - _tmp59_ = kkc_bigram_decoder_check_constraint (self, _tmp56_, _tmp56__length1, _tmp57_, _tmp58_); |
1859 | - if (!_tmp59_) { |
1860 | + _tmp49_ = gee_iterator_get (_tmp48_); |
1861 | + entry = (KkcLanguageModelEntry*) _tmp49_; |
1862 | + _tmp50_ = i; |
1863 | + _tmp51_ = entry; |
1864 | + _tmp52_ = (*_tmp51_).input; |
1865 | + _tmp53_ = g_utf8_strlen (_tmp52_, (gssize) (-1)); |
1866 | + j = _tmp50_ + _tmp53_; |
1867 | + _tmp54_ = constraint; |
1868 | + _tmp54__length1 = constraint_length1; |
1869 | + _tmp55_ = i; |
1870 | + _tmp56_ = j; |
1871 | + _tmp57_ = kkc_bigram_decoder_check_constraint (self, _tmp54_, _tmp54__length1, _tmp55_, _tmp56_); |
1872 | + if (!_tmp57_) { |
1873 | _kkc_language_model_entry_free0 (entry); |
1874 | continue; |
1875 | } |
1876 | - _tmp60_ = entry; |
1877 | - _tmp61_ = j; |
1878 | - _tmp62_ = *_tmp60_; |
1879 | - _tmp63_ = kkc_unigram_trellis_node_new (&_tmp62_, (guint) _tmp61_); |
1880 | - node = _tmp63_; |
1881 | - _tmp64_ = trellis; |
1882 | - _tmp64__length1 = trellis_length1; |
1883 | - _tmp65_ = j; |
1884 | - _tmp66_ = _tmp64_[_tmp65_]; |
1885 | - _tmp67_ = node; |
1886 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp66_, (KkcTrellisNode*) _tmp67_); |
1887 | + _tmp58_ = entry; |
1888 | + _tmp59_ = j; |
1889 | + _tmp60_ = *_tmp58_; |
1890 | + _tmp61_ = kkc_unigram_trellis_node_new (&_tmp60_, (guint) _tmp59_); |
1891 | + node = _tmp61_; |
1892 | + _tmp62_ = trellis; |
1893 | + _tmp62__length1 = trellis_length1; |
1894 | + _tmp63_ = j; |
1895 | + _tmp64_ = _tmp62_[_tmp63_]; |
1896 | + _tmp65_ = node; |
1897 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp64_, (KkcTrellisNode*) _tmp65_); |
1898 | _kkc_trellis_node_unref0 (node); |
1899 | _kkc_language_model_entry_free0 (entry); |
1900 | } |
1901 | @@ -1137,12 +1119,12 @@ |
1902 | } |
1903 | } |
1904 | } |
1905 | - _tmp68_ = trellis; |
1906 | - _tmp68__length1 = trellis_length1; |
1907 | + _tmp66_ = trellis; |
1908 | + _tmp66__length1 = trellis_length1; |
1909 | if (result_length1) { |
1910 | - *result_length1 = _tmp68__length1; |
1911 | + *result_length1 = _tmp66__length1; |
1912 | } |
1913 | - result = _tmp68_; |
1914 | + result = _tmp66_; |
1915 | _kkc_trellis_node_unref0 (eos_node); |
1916 | _kkc_trellis_node_unref0 (bos_node); |
1917 | return result; |
1918 | @@ -1154,8 +1136,8 @@ |
1919 | gint last_c = 0; |
1920 | gint* _tmp0_ = NULL; |
1921 | gint _tmp0__length1 = 0; |
1922 | + gint _tmp7_ = 0; |
1923 | gint _tmp8_ = 0; |
1924 | - gint _tmp9_ = 0; |
1925 | g_return_val_if_fail (self != NULL, FALSE); |
1926 | last_c = 0; |
1927 | _tmp0_ = constraint; |
1928 | @@ -1174,8 +1156,7 @@ |
1929 | gboolean _tmp1_ = FALSE; |
1930 | gint _tmp2_ = 0; |
1931 | gint _tmp3_ = 0; |
1932 | - gboolean _tmp6_ = FALSE; |
1933 | - gint _tmp7_ = 0; |
1934 | + gint _tmp6_ = 0; |
1935 | _tmp2_ = i; |
1936 | _tmp3_ = last_c; |
1937 | if (_tmp2_ == _tmp3_) { |
1938 | @@ -1187,19 +1168,18 @@ |
1939 | } else { |
1940 | _tmp1_ = FALSE; |
1941 | } |
1942 | - _tmp6_ = _tmp1_; |
1943 | - if (_tmp6_) { |
1944 | + if (_tmp1_) { |
1945 | result = TRUE; |
1946 | return result; |
1947 | } |
1948 | - _tmp7_ = c; |
1949 | - last_c = _tmp7_; |
1950 | + _tmp6_ = c; |
1951 | + last_c = _tmp6_; |
1952 | } |
1953 | } |
1954 | } |
1955 | - _tmp8_ = i; |
1956 | - _tmp9_ = last_c; |
1957 | - result = _tmp8_ >= _tmp9_; |
1958 | + _tmp7_ = i; |
1959 | + _tmp8_ = last_c; |
1960 | + result = _tmp7_ >= _tmp8_; |
1961 | return result; |
1962 | } |
1963 | |
1964 | @@ -1209,8 +1189,8 @@ |
1965 | gint last_c = 0; |
1966 | gint* _tmp0_ = NULL; |
1967 | gint _tmp0__length1 = 0; |
1968 | - gint _tmp16_ = 0; |
1969 | - gint _tmp17_ = 0; |
1970 | + gint _tmp13_ = 0; |
1971 | + gint _tmp14_ = 0; |
1972 | g_return_val_if_fail (self != NULL, FALSE); |
1973 | last_c = 0; |
1974 | _tmp0_ = constraint; |
1975 | @@ -1230,9 +1210,7 @@ |
1976 | gboolean _tmp2_ = FALSE; |
1977 | gint _tmp3_ = 0; |
1978 | gint _tmp4_ = 0; |
1979 | - gboolean _tmp7_ = FALSE; |
1980 | - gboolean _tmp14_ = FALSE; |
1981 | - gint _tmp15_ = 0; |
1982 | + gint _tmp12_ = 0; |
1983 | _tmp3_ = last_c; |
1984 | _tmp4_ = i; |
1985 | if (_tmp3_ <= _tmp4_) { |
1986 | @@ -1244,41 +1222,37 @@ |
1987 | } else { |
1988 | _tmp2_ = FALSE; |
1989 | } |
1990 | - _tmp7_ = _tmp2_; |
1991 | - if (_tmp7_) { |
1992 | - gboolean _tmp8_ = FALSE; |
1993 | + if (_tmp2_) { |
1994 | + gboolean _tmp7_ = FALSE; |
1995 | + gint _tmp8_ = 0; |
1996 | gint _tmp9_ = 0; |
1997 | - gint _tmp10_ = 0; |
1998 | - gboolean _tmp13_ = FALSE; |
1999 | - _tmp9_ = last_c; |
2000 | - _tmp10_ = j; |
2001 | - if (_tmp9_ <= _tmp10_) { |
2002 | + _tmp8_ = last_c; |
2003 | + _tmp9_ = j; |
2004 | + if (_tmp8_ <= _tmp9_) { |
2005 | + gint _tmp10_ = 0; |
2006 | gint _tmp11_ = 0; |
2007 | - gint _tmp12_ = 0; |
2008 | - _tmp11_ = j; |
2009 | - _tmp12_ = c; |
2010 | - _tmp8_ = _tmp11_ <= _tmp12_; |
2011 | + _tmp10_ = j; |
2012 | + _tmp11_ = c; |
2013 | + _tmp7_ = _tmp10_ <= _tmp11_; |
2014 | } else { |
2015 | - _tmp8_ = FALSE; |
2016 | + _tmp7_ = FALSE; |
2017 | } |
2018 | - _tmp13_ = _tmp8_; |
2019 | - _tmp1_ = _tmp13_; |
2020 | + _tmp1_ = _tmp7_; |
2021 | } else { |
2022 | _tmp1_ = FALSE; |
2023 | } |
2024 | - _tmp14_ = _tmp1_; |
2025 | - if (_tmp14_) { |
2026 | + if (_tmp1_) { |
2027 | result = TRUE; |
2028 | return result; |
2029 | } |
2030 | - _tmp15_ = c; |
2031 | - last_c = _tmp15_; |
2032 | + _tmp12_ = c; |
2033 | + last_c = _tmp12_; |
2034 | } |
2035 | } |
2036 | } |
2037 | - _tmp16_ = i; |
2038 | - _tmp17_ = last_c; |
2039 | - result = _tmp16_ >= _tmp17_; |
2040 | + _tmp13_ = i; |
2041 | + _tmp14_ = last_c; |
2042 | + result = _tmp13_ >= _tmp14_; |
2043 | return result; |
2044 | } |
2045 | |
2046 | @@ -1298,191 +1272,187 @@ |
2047 | gboolean _tmp0_ = FALSE; |
2048 | _tmp0_ = TRUE; |
2049 | while (TRUE) { |
2050 | - gboolean _tmp1_ = FALSE; |
2051 | - gint _tmp3_ = 0; |
2052 | - GeeArrayList** _tmp4_ = NULL; |
2053 | - gint _tmp4__length1 = 0; |
2054 | - _tmp1_ = _tmp0_; |
2055 | - if (!_tmp1_) { |
2056 | - gint _tmp2_ = 0; |
2057 | - _tmp2_ = i; |
2058 | - i = _tmp2_ + 1; |
2059 | + gint _tmp2_ = 0; |
2060 | + GeeArrayList** _tmp3_ = NULL; |
2061 | + gint _tmp3__length1 = 0; |
2062 | + if (!_tmp0_) { |
2063 | + gint _tmp1_ = 0; |
2064 | + _tmp1_ = i; |
2065 | + i = _tmp1_ + 1; |
2066 | } |
2067 | _tmp0_ = FALSE; |
2068 | - _tmp3_ = i; |
2069 | - _tmp4_ = trellis; |
2070 | - _tmp4__length1 = trellis_length1; |
2071 | - if (!(_tmp3_ < _tmp4__length1)) { |
2072 | + _tmp2_ = i; |
2073 | + _tmp3_ = trellis; |
2074 | + _tmp3__length1 = trellis_length1; |
2075 | + if (!(_tmp2_ < _tmp3__length1)) { |
2076 | break; |
2077 | } |
2078 | { |
2079 | GeeArrayList* _node_list = NULL; |
2080 | - GeeArrayList** _tmp5_ = NULL; |
2081 | - gint _tmp5__length1 = 0; |
2082 | - gint _tmp6_ = 0; |
2083 | + GeeArrayList** _tmp4_ = NULL; |
2084 | + gint _tmp4__length1 = 0; |
2085 | + gint _tmp5_ = 0; |
2086 | + GeeArrayList* _tmp6_ = NULL; |
2087 | GeeArrayList* _tmp7_ = NULL; |
2088 | + gint _node_size = 0; |
2089 | GeeArrayList* _tmp8_ = NULL; |
2090 | - gint _node_size = 0; |
2091 | - GeeArrayList* _tmp9_ = NULL; |
2092 | + gint _tmp9_ = 0; |
2093 | gint _tmp10_ = 0; |
2094 | - gint _tmp11_ = 0; |
2095 | gint _node_index = 0; |
2096 | - _tmp5_ = trellis; |
2097 | - _tmp5__length1 = trellis_length1; |
2098 | - _tmp6_ = i; |
2099 | - _tmp7_ = _tmp5_[_tmp6_]; |
2100 | - _tmp8_ = _g_object_ref0 (_tmp7_); |
2101 | - _node_list = _tmp8_; |
2102 | - _tmp9_ = _node_list; |
2103 | - _tmp10_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp9_); |
2104 | - _tmp11_ = _tmp10_; |
2105 | - _node_size = _tmp11_; |
2106 | + _tmp4_ = trellis; |
2107 | + _tmp4__length1 = trellis_length1; |
2108 | + _tmp5_ = i; |
2109 | + _tmp6_ = _tmp4_[_tmp5_]; |
2110 | + _tmp7_ = _g_object_ref0 (_tmp6_); |
2111 | + _node_list = _tmp7_; |
2112 | + _tmp8_ = _node_list; |
2113 | + _tmp9_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp8_); |
2114 | + _tmp10_ = _tmp9_; |
2115 | + _node_size = _tmp10_; |
2116 | _node_index = -1; |
2117 | while (TRUE) { |
2118 | + gint _tmp11_ = 0; |
2119 | gint _tmp12_ = 0; |
2120 | gint _tmp13_ = 0; |
2121 | - gint _tmp14_ = 0; |
2122 | KkcTrellisNode* node = NULL; |
2123 | - GeeArrayList* _tmp15_ = NULL; |
2124 | - gint _tmp16_ = 0; |
2125 | - gpointer _tmp17_ = NULL; |
2126 | + GeeArrayList* _tmp14_ = NULL; |
2127 | + gint _tmp15_ = 0; |
2128 | + gpointer _tmp16_ = NULL; |
2129 | gint j = 0; |
2130 | - gint _tmp18_ = 0; |
2131 | - KkcTrellisNode* _tmp19_ = NULL; |
2132 | + gint _tmp17_ = 0; |
2133 | + KkcTrellisNode* _tmp18_ = NULL; |
2134 | + guint _tmp19_ = 0U; |
2135 | guint _tmp20_ = 0U; |
2136 | - guint _tmp21_ = 0U; |
2137 | - gint _tmp22_ = 0; |
2138 | + gint _tmp21_ = 0; |
2139 | gdouble max_cost = 0.0; |
2140 | - gdouble _tmp23_ = 0.0; |
2141 | KkcTrellisNode* max_pnode = NULL; |
2142 | - KkcTrellisNode* _tmp48_ = NULL; |
2143 | + KkcTrellisNode* _tmp46_ = NULL; |
2144 | + KkcTrellisNode* _tmp51_ = NULL; |
2145 | + gdouble _tmp52_ = 0.0; |
2146 | KkcTrellisNode* _tmp53_ = NULL; |
2147 | - gdouble _tmp54_ = 0.0; |
2148 | + KkcTrellisNode* _tmp54_ = NULL; |
2149 | KkcTrellisNode* _tmp55_ = NULL; |
2150 | - KkcTrellisNode* _tmp56_ = NULL; |
2151 | - KkcTrellisNode* _tmp57_ = NULL; |
2152 | + _tmp11_ = _node_index; |
2153 | + _node_index = _tmp11_ + 1; |
2154 | _tmp12_ = _node_index; |
2155 | - _node_index = _tmp12_ + 1; |
2156 | - _tmp13_ = _node_index; |
2157 | - _tmp14_ = _node_size; |
2158 | - if (!(_tmp13_ < _tmp14_)) { |
2159 | + _tmp13_ = _node_size; |
2160 | + if (!(_tmp12_ < _tmp13_)) { |
2161 | break; |
2162 | } |
2163 | - _tmp15_ = _node_list; |
2164 | - _tmp16_ = _node_index; |
2165 | - _tmp17_ = gee_abstract_list_get ((GeeAbstractList*) _tmp15_, _tmp16_); |
2166 | - node = (KkcTrellisNode*) _tmp17_; |
2167 | - _tmp18_ = i; |
2168 | - _tmp19_ = node; |
2169 | - _tmp20_ = kkc_trellis_node_get_length (_tmp19_); |
2170 | - _tmp21_ = _tmp20_; |
2171 | - j = _tmp18_ - ((gint) _tmp21_); |
2172 | - _tmp22_ = j; |
2173 | - if (_tmp22_ < 0) { |
2174 | + _tmp14_ = _node_list; |
2175 | + _tmp15_ = _node_index; |
2176 | + _tmp16_ = gee_abstract_list_get ((GeeAbstractList*) _tmp14_, _tmp15_); |
2177 | + node = (KkcTrellisNode*) _tmp16_; |
2178 | + _tmp17_ = i; |
2179 | + _tmp18_ = node; |
2180 | + _tmp19_ = kkc_trellis_node_get_length (_tmp18_); |
2181 | + _tmp20_ = _tmp19_; |
2182 | + j = _tmp17_ - ((gint) _tmp20_); |
2183 | + _tmp21_ = j; |
2184 | + if (_tmp21_ < 0) { |
2185 | _kkc_trellis_node_unref0 (node); |
2186 | continue; |
2187 | } |
2188 | - _tmp23_ = DBL_MAX; |
2189 | - max_cost = -_tmp23_; |
2190 | + max_cost = -DBL_MAX; |
2191 | max_pnode = NULL; |
2192 | { |
2193 | GeeArrayList* _pnode_list = NULL; |
2194 | - GeeArrayList** _tmp24_ = NULL; |
2195 | - gint _tmp24__length1 = 0; |
2196 | - gint _tmp25_ = 0; |
2197 | + GeeArrayList** _tmp22_ = NULL; |
2198 | + gint _tmp22__length1 = 0; |
2199 | + gint _tmp23_ = 0; |
2200 | + GeeArrayList* _tmp24_ = NULL; |
2201 | + GeeArrayList* _tmp25_ = NULL; |
2202 | + gint _pnode_size = 0; |
2203 | GeeArrayList* _tmp26_ = NULL; |
2204 | - GeeArrayList* _tmp27_ = NULL; |
2205 | - gint _pnode_size = 0; |
2206 | - GeeArrayList* _tmp28_ = NULL; |
2207 | - gint _tmp29_ = 0; |
2208 | - gint _tmp30_ = 0; |
2209 | + gint _tmp27_ = 0; |
2210 | + gint _tmp28_ = 0; |
2211 | gint _pnode_index = 0; |
2212 | - _tmp24_ = trellis; |
2213 | - _tmp24__length1 = trellis_length1; |
2214 | - _tmp25_ = j; |
2215 | - _tmp26_ = _tmp24_[_tmp25_]; |
2216 | - _tmp27_ = _g_object_ref0 (_tmp26_); |
2217 | - _pnode_list = _tmp27_; |
2218 | - _tmp28_ = _pnode_list; |
2219 | - _tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp28_); |
2220 | - _tmp30_ = _tmp29_; |
2221 | - _pnode_size = _tmp30_; |
2222 | + _tmp22_ = trellis; |
2223 | + _tmp22__length1 = trellis_length1; |
2224 | + _tmp23_ = j; |
2225 | + _tmp24_ = _tmp22_[_tmp23_]; |
2226 | + _tmp25_ = _g_object_ref0 (_tmp24_); |
2227 | + _pnode_list = _tmp25_; |
2228 | + _tmp26_ = _pnode_list; |
2229 | + _tmp27_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp26_); |
2230 | + _tmp28_ = _tmp27_; |
2231 | + _pnode_size = _tmp28_; |
2232 | _pnode_index = -1; |
2233 | while (TRUE) { |
2234 | + gint _tmp29_ = 0; |
2235 | + gint _tmp30_ = 0; |
2236 | gint _tmp31_ = 0; |
2237 | - gint _tmp32_ = 0; |
2238 | + KkcTrellisNode* pnode = NULL; |
2239 | + GeeArrayList* _tmp32_ = NULL; |
2240 | gint _tmp33_ = 0; |
2241 | - KkcTrellisNode* pnode = NULL; |
2242 | - GeeArrayList* _tmp34_ = NULL; |
2243 | - gint _tmp35_ = 0; |
2244 | - gpointer _tmp36_ = NULL; |
2245 | + gpointer _tmp34_ = NULL; |
2246 | gdouble cost = 0.0; |
2247 | + KkcTrellisNode* _tmp35_ = NULL; |
2248 | + gdouble _tmp36_ = 0.0; |
2249 | KkcTrellisNode* _tmp37_ = NULL; |
2250 | - gdouble _tmp38_ = 0.0; |
2251 | - KkcTrellisNode* _tmp39_ = NULL; |
2252 | - KkcTrellisNode* _tmp40_ = NULL; |
2253 | - gint _tmp41_ = 0; |
2254 | + KkcTrellisNode* _tmp38_ = NULL; |
2255 | + gint _tmp39_ = 0; |
2256 | + gdouble _tmp40_ = 0.0; |
2257 | + gdouble _tmp41_ = 0.0; |
2258 | gdouble _tmp42_ = 0.0; |
2259 | - gdouble _tmp43_ = 0.0; |
2260 | - gdouble _tmp44_ = 0.0; |
2261 | - _tmp31_ = _pnode_index; |
2262 | - _pnode_index = _tmp31_ + 1; |
2263 | - _tmp32_ = _pnode_index; |
2264 | - _tmp33_ = _pnode_size; |
2265 | - if (!(_tmp32_ < _tmp33_)) { |
2266 | + _tmp29_ = _pnode_index; |
2267 | + _pnode_index = _tmp29_ + 1; |
2268 | + _tmp30_ = _pnode_index; |
2269 | + _tmp31_ = _pnode_size; |
2270 | + if (!(_tmp30_ < _tmp31_)) { |
2271 | break; |
2272 | } |
2273 | - _tmp34_ = _pnode_list; |
2274 | - _tmp35_ = _pnode_index; |
2275 | - _tmp36_ = gee_abstract_list_get ((GeeAbstractList*) _tmp34_, _tmp35_); |
2276 | - pnode = (KkcTrellisNode*) _tmp36_; |
2277 | + _tmp32_ = _pnode_list; |
2278 | + _tmp33_ = _pnode_index; |
2279 | + _tmp34_ = gee_abstract_list_get ((GeeAbstractList*) _tmp32_, _tmp33_); |
2280 | + pnode = (KkcTrellisNode*) _tmp34_; |
2281 | + _tmp35_ = pnode; |
2282 | + _tmp36_ = _tmp35_->cumulative_cost; |
2283 | _tmp37_ = pnode; |
2284 | - _tmp38_ = _tmp37_->cumulative_cost; |
2285 | - _tmp39_ = pnode; |
2286 | - _tmp40_ = node; |
2287 | - _tmp41_ = j; |
2288 | - _tmp42_ = kkc_bigram_decoder_path_cost (self, _tmp39_, _tmp40_, _tmp41_); |
2289 | - cost = _tmp38_ + _tmp42_; |
2290 | - _tmp43_ = cost; |
2291 | - _tmp44_ = max_cost; |
2292 | - if (_tmp43_ > _tmp44_) { |
2293 | - KkcTrellisNode* _tmp45_ = NULL; |
2294 | - KkcTrellisNode* _tmp46_ = NULL; |
2295 | - gdouble _tmp47_ = 0.0; |
2296 | - _tmp45_ = pnode; |
2297 | - _tmp46_ = _kkc_trellis_node_ref0 (_tmp45_); |
2298 | + _tmp38_ = node; |
2299 | + _tmp39_ = j; |
2300 | + _tmp40_ = kkc_bigram_decoder_path_cost (self, _tmp37_, _tmp38_, _tmp39_); |
2301 | + cost = _tmp36_ + _tmp40_; |
2302 | + _tmp41_ = cost; |
2303 | + _tmp42_ = max_cost; |
2304 | + if (_tmp41_ > _tmp42_) { |
2305 | + KkcTrellisNode* _tmp43_ = NULL; |
2306 | + KkcTrellisNode* _tmp44_ = NULL; |
2307 | + gdouble _tmp45_ = 0.0; |
2308 | + _tmp43_ = pnode; |
2309 | + _tmp44_ = _kkc_trellis_node_ref0 (_tmp43_); |
2310 | _kkc_trellis_node_unref0 (max_pnode); |
2311 | - max_pnode = _tmp46_; |
2312 | - _tmp47_ = cost; |
2313 | - max_cost = _tmp47_; |
2314 | + max_pnode = _tmp44_; |
2315 | + _tmp45_ = cost; |
2316 | + max_cost = _tmp45_; |
2317 | } |
2318 | _kkc_trellis_node_unref0 (pnode); |
2319 | } |
2320 | _g_object_unref0 (_pnode_list); |
2321 | } |
2322 | - _tmp48_ = max_pnode; |
2323 | - if (_tmp48_ == NULL) { |
2324 | - GeeArrayList** _tmp49_ = NULL; |
2325 | - gint _tmp49__length1 = 0; |
2326 | - gint _tmp50_ = 0; |
2327 | - GeeArrayList* _tmp51_ = NULL; |
2328 | - gpointer _tmp52_ = NULL; |
2329 | - _tmp49_ = trellis; |
2330 | - _tmp49__length1 = trellis_length1; |
2331 | - _tmp50_ = i; |
2332 | - _tmp51_ = _tmp49_[_tmp50_]; |
2333 | - _tmp52_ = gee_abstract_list_get ((GeeAbstractList*) _tmp51_, 0); |
2334 | + _tmp46_ = max_pnode; |
2335 | + if (_tmp46_ == NULL) { |
2336 | + GeeArrayList** _tmp47_ = NULL; |
2337 | + gint _tmp47__length1 = 0; |
2338 | + gint _tmp48_ = 0; |
2339 | + GeeArrayList* _tmp49_ = NULL; |
2340 | + gpointer _tmp50_ = NULL; |
2341 | + _tmp47_ = trellis; |
2342 | + _tmp47__length1 = trellis_length1; |
2343 | + _tmp48_ = i; |
2344 | + _tmp49_ = _tmp47_[_tmp48_]; |
2345 | + _tmp50_ = gee_abstract_list_get ((GeeAbstractList*) _tmp49_, 0); |
2346 | _kkc_trellis_node_unref0 (max_pnode); |
2347 | - max_pnode = (KkcTrellisNode*) _tmp52_; |
2348 | + max_pnode = (KkcTrellisNode*) _tmp50_; |
2349 | } |
2350 | + _tmp51_ = node; |
2351 | + _tmp52_ = max_cost; |
2352 | + _tmp51_->cumulative_cost = _tmp52_; |
2353 | _tmp53_ = node; |
2354 | - _tmp54_ = max_cost; |
2355 | - _tmp53_->cumulative_cost = _tmp54_; |
2356 | - _tmp55_ = node; |
2357 | - _tmp56_ = max_pnode; |
2358 | - _tmp57_ = _kkc_trellis_node_ref0 (_tmp56_); |
2359 | - _kkc_trellis_node_unref0 (_tmp55_->previous); |
2360 | - _tmp55_->previous = _tmp57_; |
2361 | + _tmp54_ = max_pnode; |
2362 | + _tmp55_ = _kkc_trellis_node_ref0 (_tmp54_); |
2363 | + _kkc_trellis_node_unref0 (_tmp53_->previous); |
2364 | + _tmp53_->previous = _tmp55_; |
2365 | _kkc_trellis_node_unref0 (max_pnode); |
2366 | _kkc_trellis_node_unref0 (node); |
2367 | } |
2368 | @@ -1504,16 +1474,15 @@ |
2369 | KkcUnigramTrellisNode* _tmp3_ = NULL; |
2370 | gboolean _tmp4_ = FALSE; |
2371 | KkcUnigramTrellisNode* _tmp5_ = NULL; |
2372 | - gboolean _tmp7_ = FALSE; |
2373 | + KkcBigramLanguageModel* _tmp7_ = NULL; |
2374 | KkcBigramLanguageModel* _tmp8_ = NULL; |
2375 | - KkcBigramLanguageModel* _tmp9_ = NULL; |
2376 | - KkcUnigramTrellisNode* _tmp10_ = NULL; |
2377 | + KkcUnigramTrellisNode* _tmp9_ = NULL; |
2378 | + KkcLanguageModelEntry _tmp10_ = {0}; |
2379 | KkcLanguageModelEntry _tmp11_ = {0}; |
2380 | - KkcLanguageModelEntry _tmp12_ = {0}; |
2381 | - KkcUnigramTrellisNode* _tmp13_ = NULL; |
2382 | + KkcUnigramTrellisNode* _tmp12_ = NULL; |
2383 | + KkcLanguageModelEntry _tmp13_ = {0}; |
2384 | KkcLanguageModelEntry _tmp14_ = {0}; |
2385 | - KkcLanguageModelEntry _tmp15_ = {0}; |
2386 | - gdouble _tmp16_ = 0.0; |
2387 | + gdouble _tmp15_ = 0.0; |
2388 | g_return_val_if_fail (pnode != NULL, 0.0); |
2389 | g_return_val_if_fail (node != NULL, 0.0); |
2390 | _tmp0_ = pnode; |
2391 | @@ -1530,18 +1499,17 @@ |
2392 | } else { |
2393 | _tmp4_ = FALSE; |
2394 | } |
2395 | - _tmp7_ = _tmp4_; |
2396 | - _vala_assert (_tmp7_, "upnode != null && unode != null"); |
2397 | - _tmp8_ = kkc_bigram_decoder_get_model (self); |
2398 | - _tmp9_ = _tmp8_; |
2399 | - _tmp10_ = upnode; |
2400 | - kkc_unigram_trellis_node_get_entry (_tmp10_, &_tmp11_); |
2401 | - _tmp12_ = _tmp11_; |
2402 | - _tmp13_ = unode; |
2403 | - kkc_unigram_trellis_node_get_entry (_tmp13_, &_tmp14_); |
2404 | - _tmp15_ = _tmp14_; |
2405 | - _tmp16_ = kkc_bigram_language_model_bigram_backoff_cost (_tmp9_, &_tmp12_, &_tmp15_); |
2406 | - result = _tmp16_; |
2407 | + _vala_assert (_tmp4_, "upnode != null && unode != null"); |
2408 | + _tmp7_ = kkc_bigram_decoder_get_model (self); |
2409 | + _tmp8_ = _tmp7_; |
2410 | + _tmp9_ = upnode; |
2411 | + kkc_unigram_trellis_node_get_entry (_tmp9_, &_tmp10_); |
2412 | + _tmp11_ = _tmp10_; |
2413 | + _tmp12_ = unode; |
2414 | + kkc_unigram_trellis_node_get_entry (_tmp12_, &_tmp13_); |
2415 | + _tmp14_ = _tmp13_; |
2416 | + _tmp15_ = kkc_bigram_language_model_bigram_backoff_cost (_tmp8_, &_tmp11_, &_tmp14_); |
2417 | + result = _tmp15_; |
2418 | _kkc_trellis_node_unref0 (unode); |
2419 | _kkc_trellis_node_unref0 (upnode); |
2420 | return result; |
2421 | @@ -1566,113 +1534,109 @@ |
2422 | gboolean _tmp0_ = FALSE; |
2423 | _tmp0_ = TRUE; |
2424 | while (TRUE) { |
2425 | - gboolean _tmp1_ = FALSE; |
2426 | + KkcNbestNode* _tmp3_ = NULL; |
2427 | KkcNbestNode* _tmp4_ = NULL; |
2428 | - KkcNbestNode* _tmp5_ = NULL; |
2429 | - _tmp1_ = _tmp0_; |
2430 | - if (!_tmp1_) { |
2431 | + if (!_tmp0_) { |
2432 | + KkcNbestNode* _tmp1_ = NULL; |
2433 | KkcNbestNode* _tmp2_ = NULL; |
2434 | - KkcNbestNode* _tmp3_ = NULL; |
2435 | - _tmp2_ = nbest_node; |
2436 | - _tmp3_ = _tmp2_->next; |
2437 | - nbest_node = _tmp3_; |
2438 | + _tmp1_ = nbest_node; |
2439 | + _tmp2_ = _tmp1_->next; |
2440 | + nbest_node = _tmp2_; |
2441 | } |
2442 | _tmp0_ = FALSE; |
2443 | - _tmp4_ = nbest_node; |
2444 | - _tmp5_ = _tmp4_->next; |
2445 | - if (!(_tmp5_ != NULL)) { |
2446 | + _tmp3_ = nbest_node; |
2447 | + _tmp4_ = _tmp3_->next; |
2448 | + if (!(_tmp4_ != NULL)) { |
2449 | break; |
2450 | } |
2451 | { |
2452 | gint i = 0; |
2453 | i = 0; |
2454 | { |
2455 | - gboolean _tmp6_ = FALSE; |
2456 | - _tmp6_ = TRUE; |
2457 | + gboolean _tmp5_ = FALSE; |
2458 | + _tmp5_ = TRUE; |
2459 | while (TRUE) { |
2460 | - gboolean _tmp7_ = FALSE; |
2461 | - gint _tmp9_ = 0; |
2462 | - KkcNbestNode* _tmp10_ = NULL; |
2463 | - KkcTrellisNode* _tmp11_ = NULL; |
2464 | - KkcLanguageModelEntry* _tmp12_ = NULL; |
2465 | - gint _tmp12__length1 = 0; |
2466 | - KkcLanguageModelEntry* _tmp13_ = NULL; |
2467 | - gint _tmp13__length1 = 0; |
2468 | + gint _tmp7_ = 0; |
2469 | + KkcNbestNode* _tmp8_ = NULL; |
2470 | + KkcTrellisNode* _tmp9_ = NULL; |
2471 | + KkcLanguageModelEntry* _tmp10_ = NULL; |
2472 | + gint _tmp10__length1 = 0; |
2473 | + KkcLanguageModelEntry* _tmp11_ = NULL; |
2474 | + gint _tmp11__length1 = 0; |
2475 | KkcLanguageModelEntry entry = {0}; |
2476 | - KkcNbestNode* _tmp14_ = NULL; |
2477 | - KkcTrellisNode* _tmp15_ = NULL; |
2478 | - KkcLanguageModelEntry* _tmp16_ = NULL; |
2479 | - gint _tmp16__length1 = 0; |
2480 | - KkcLanguageModelEntry* _tmp17_ = NULL; |
2481 | - gint _tmp17__length1 = 0; |
2482 | - gint _tmp18_ = 0; |
2483 | + KkcNbestNode* _tmp12_ = NULL; |
2484 | + KkcTrellisNode* _tmp13_ = NULL; |
2485 | + KkcLanguageModelEntry* _tmp14_ = NULL; |
2486 | + gint _tmp14__length1 = 0; |
2487 | + KkcLanguageModelEntry* _tmp15_ = NULL; |
2488 | + gint _tmp15__length1 = 0; |
2489 | + gint _tmp16_ = 0; |
2490 | + KkcLanguageModelEntry _tmp17_ = {0}; |
2491 | + KkcLanguageModelEntry _tmp18_ = {0}; |
2492 | + KkcSegment* segment = NULL; |
2493 | KkcLanguageModelEntry _tmp19_ = {0}; |
2494 | - KkcLanguageModelEntry _tmp20_ = {0}; |
2495 | - KkcSegment* segment = NULL; |
2496 | + const gchar* _tmp20_ = NULL; |
2497 | KkcLanguageModelEntry _tmp21_ = {0}; |
2498 | const gchar* _tmp22_ = NULL; |
2499 | - KkcLanguageModelEntry _tmp23_ = {0}; |
2500 | - const gchar* _tmp24_ = NULL; |
2501 | - KkcSegment* _tmp25_ = NULL; |
2502 | - KkcSegment* _tmp26_ = NULL; |
2503 | - KkcSegment* _tmp29_ = NULL; |
2504 | - KkcSegment* _tmp33_ = NULL; |
2505 | - KkcSegment* _tmp34_ = NULL; |
2506 | - _tmp7_ = _tmp6_; |
2507 | - if (!_tmp7_) { |
2508 | - gint _tmp8_ = 0; |
2509 | - _tmp8_ = i; |
2510 | - i = _tmp8_ + 1; |
2511 | + KkcSegment* _tmp23_ = NULL; |
2512 | + KkcSegment* _tmp24_ = NULL; |
2513 | + KkcSegment* _tmp27_ = NULL; |
2514 | + KkcSegment* _tmp31_ = NULL; |
2515 | + KkcSegment* _tmp32_ = NULL; |
2516 | + if (!_tmp5_) { |
2517 | + gint _tmp6_ = 0; |
2518 | + _tmp6_ = i; |
2519 | + i = _tmp6_ + 1; |
2520 | } |
2521 | - _tmp6_ = FALSE; |
2522 | - _tmp9_ = i; |
2523 | - _tmp10_ = nbest_node; |
2524 | - _tmp11_ = _tmp10_->node; |
2525 | - _tmp12_ = kkc_trellis_node_get_entries (_tmp11_, &_tmp12__length1); |
2526 | - _tmp13_ = _tmp12_; |
2527 | - _tmp13__length1 = _tmp12__length1; |
2528 | - if (!(_tmp9_ < _tmp13__length1)) { |
2529 | + _tmp5_ = FALSE; |
2530 | + _tmp7_ = i; |
2531 | + _tmp8_ = nbest_node; |
2532 | + _tmp9_ = _tmp8_->node; |
2533 | + _tmp10_ = kkc_trellis_node_get_entries (_tmp9_, &_tmp10__length1); |
2534 | + _tmp11_ = _tmp10_; |
2535 | + _tmp11__length1 = _tmp10__length1; |
2536 | + if (!(_tmp7_ < _tmp11__length1)) { |
2537 | break; |
2538 | } |
2539 | - _tmp14_ = nbest_node; |
2540 | - _tmp15_ = _tmp14_->node; |
2541 | - _tmp16_ = kkc_trellis_node_get_entries (_tmp15_, &_tmp16__length1); |
2542 | - _tmp17_ = _tmp16_; |
2543 | - _tmp17__length1 = _tmp16__length1; |
2544 | - _tmp18_ = i; |
2545 | - _tmp19_ = _tmp17_[_tmp18_]; |
2546 | - kkc_language_model_entry_copy (&_tmp19_, &_tmp20_); |
2547 | - entry = _tmp20_; |
2548 | + _tmp12_ = nbest_node; |
2549 | + _tmp13_ = _tmp12_->node; |
2550 | + _tmp14_ = kkc_trellis_node_get_entries (_tmp13_, &_tmp14__length1); |
2551 | + _tmp15_ = _tmp14_; |
2552 | + _tmp15__length1 = _tmp14__length1; |
2553 | + _tmp16_ = i; |
2554 | + _tmp17_ = _tmp15_[_tmp16_]; |
2555 | + kkc_language_model_entry_copy (&_tmp17_, &_tmp18_); |
2556 | + entry = _tmp18_; |
2557 | + _tmp19_ = entry; |
2558 | + _tmp20_ = _tmp19_.input; |
2559 | _tmp21_ = entry; |
2560 | - _tmp22_ = _tmp21_.input; |
2561 | - _tmp23_ = entry; |
2562 | - _tmp24_ = _tmp23_.output; |
2563 | - _tmp25_ = kkc_segment_new (_tmp22_, _tmp24_); |
2564 | - segment = _tmp25_; |
2565 | - _tmp26_ = start_segment; |
2566 | - if (_tmp26_ == NULL) { |
2567 | - KkcSegment* _tmp27_ = NULL; |
2568 | + _tmp22_ = _tmp21_.output; |
2569 | + _tmp23_ = kkc_segment_new (_tmp20_, _tmp22_); |
2570 | + segment = _tmp23_; |
2571 | + _tmp24_ = start_segment; |
2572 | + if (_tmp24_ == NULL) { |
2573 | + KkcSegment* _tmp25_ = NULL; |
2574 | + KkcSegment* _tmp26_ = NULL; |
2575 | + _tmp25_ = segment; |
2576 | + _tmp26_ = _g_object_ref0 (_tmp25_); |
2577 | + _g_object_unref0 (start_segment); |
2578 | + start_segment = _tmp26_; |
2579 | + } |
2580 | + _tmp27_ = previous_segment; |
2581 | + if (_tmp27_ != NULL) { |
2582 | KkcSegment* _tmp28_ = NULL; |
2583 | - _tmp27_ = segment; |
2584 | - _tmp28_ = _g_object_ref0 (_tmp27_); |
2585 | - _g_object_unref0 (start_segment); |
2586 | - start_segment = _tmp28_; |
2587 | - } |
2588 | - _tmp29_ = previous_segment; |
2589 | - if (_tmp29_ != NULL) { |
2590 | + KkcSegment* _tmp29_ = NULL; |
2591 | KkcSegment* _tmp30_ = NULL; |
2592 | - KkcSegment* _tmp31_ = NULL; |
2593 | - KkcSegment* _tmp32_ = NULL; |
2594 | - _tmp30_ = previous_segment; |
2595 | - _tmp31_ = segment; |
2596 | - _tmp32_ = _g_object_ref0 (_tmp31_); |
2597 | - _g_object_unref0 (_tmp30_->next); |
2598 | - _tmp30_->next = _tmp32_; |
2599 | + _tmp28_ = previous_segment; |
2600 | + _tmp29_ = segment; |
2601 | + _tmp30_ = _g_object_ref0 (_tmp29_); |
2602 | + _g_object_unref0 (_tmp28_->next); |
2603 | + _tmp28_->next = _tmp30_; |
2604 | } |
2605 | - _tmp33_ = segment; |
2606 | - _tmp34_ = _g_object_ref0 (_tmp33_); |
2607 | + _tmp31_ = segment; |
2608 | + _tmp32_ = _g_object_ref0 (_tmp31_); |
2609 | _g_object_unref0 (previous_segment); |
2610 | - previous_segment = _tmp34_; |
2611 | + previous_segment = _tmp32_; |
2612 | _g_object_unref0 (segment); |
2613 | kkc_language_model_entry_destroy (&entry); |
2614 | } |
2615 | @@ -1709,6 +1673,13 @@ |
2616 | } |
2617 | |
2618 | |
2619 | +static gint _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { |
2620 | + gint result; |
2621 | + result = kkc_bigram_decoder_compare_nbest_node ((KkcNbestNode*) a, (KkcNbestNode*) b); |
2622 | + return result; |
2623 | +} |
2624 | + |
2625 | + |
2626 | static gpointer _kkc_nbest_node_ref0 (gpointer self) { |
2627 | return self ? kkc_nbest_node_ref (self) : NULL; |
2628 | } |
2629 | @@ -1730,32 +1701,28 @@ |
2630 | gpointer _tmp6_ = NULL; |
2631 | gint _tmp7_ = 0; |
2632 | GeeHashMap* trellis_nbest_map = NULL; |
2633 | - GHashFunc _tmp49_ = NULL; |
2634 | - GEqualFunc _tmp50_ = NULL; |
2635 | - GeeHashMap* _tmp51_ = NULL; |
2636 | + GeeHashMap* _tmp47_ = NULL; |
2637 | GeePriorityQueue* open_list = NULL; |
2638 | - GeePriorityQueue* _tmp52_ = NULL; |
2639 | + GeePriorityQueue* _tmp48_ = NULL; |
2640 | GeePriorityQueue* close_list = NULL; |
2641 | - GeePriorityQueue* _tmp53_ = NULL; |
2642 | + GeePriorityQueue* _tmp49_ = NULL; |
2643 | GeeHashSet* duplicates = NULL; |
2644 | - GHashFunc _tmp54_ = NULL; |
2645 | - GEqualFunc _tmp55_ = NULL; |
2646 | - GeeHashSet* _tmp56_ = NULL; |
2647 | + GeeHashSet* _tmp50_ = NULL; |
2648 | KkcNbestNode* eos_nbest_node = NULL; |
2649 | - KkcTrellisNode* _tmp57_ = NULL; |
2650 | - KkcNbestNode* _tmp58_ = NULL; |
2651 | - GeeHashMap* _tmp59_ = NULL; |
2652 | - KkcTrellisNode* _tmp60_ = NULL; |
2653 | - KkcNbestNode* _tmp61_ = NULL; |
2654 | - GeePriorityQueue* _tmp62_ = NULL; |
2655 | - KkcNbestNode* _tmp63_ = NULL; |
2656 | + KkcTrellisNode* _tmp51_ = NULL; |
2657 | + KkcNbestNode* _tmp52_ = NULL; |
2658 | + GeeHashMap* _tmp53_ = NULL; |
2659 | + KkcTrellisNode* _tmp54_ = NULL; |
2660 | + KkcNbestNode* _tmp55_ = NULL; |
2661 | + GeePriorityQueue* _tmp56_ = NULL; |
2662 | + KkcNbestNode* _tmp57_ = NULL; |
2663 | GeeArrayList* segments = NULL; |
2664 | - GeeArrayList* _tmp151_ = NULL; |
2665 | - GeeArrayList* _tmp163_ = NULL; |
2666 | - gint _tmp164_ = 0; |
2667 | - gpointer* _tmp165_ = NULL; |
2668 | - KkcSegment** _tmp166_ = NULL; |
2669 | - gint _tmp166__length1 = 0; |
2670 | + GeeArrayList* _tmp144_ = NULL; |
2671 | + GeeArrayList* _tmp156_ = NULL; |
2672 | + gint _tmp157_ = 0; |
2673 | + gpointer* _tmp158_ = NULL; |
2674 | + KkcSegment** _tmp159_ = NULL; |
2675 | + gint _tmp159__length1 = 0; |
2676 | g_return_val_if_fail (self != NULL, NULL); |
2677 | _tmp0_ = trellis; |
2678 | _tmp0__length1 = trellis_length1; |
2679 | @@ -1773,11 +1740,11 @@ |
2680 | if (_tmp7_ == 1) { |
2681 | KkcSegment* segment = NULL; |
2682 | KkcSegment* next_segment = NULL; |
2683 | - KkcSegment* _tmp45_ = NULL; |
2684 | - KkcSegment* _tmp46_ = NULL; |
2685 | - KkcSegment** _tmp47_ = NULL; |
2686 | - KkcSegment** _tmp48_ = NULL; |
2687 | - gint _tmp48__length1 = 0; |
2688 | + KkcSegment* _tmp43_ = NULL; |
2689 | + KkcSegment* _tmp44_ = NULL; |
2690 | + KkcSegment** _tmp45_ = NULL; |
2691 | + KkcSegment** _tmp46_ = NULL; |
2692 | + gint _tmp46__length1 = 0; |
2693 | segment = NULL; |
2694 | next_segment = NULL; |
2695 | { |
2696 | @@ -1793,110 +1760,106 @@ |
2697 | gboolean _tmp11_ = FALSE; |
2698 | _tmp11_ = TRUE; |
2699 | while (TRUE) { |
2700 | - gboolean _tmp12_ = FALSE; |
2701 | - KkcTrellisNode* _tmp16_ = NULL; |
2702 | - _tmp12_ = _tmp11_; |
2703 | - if (!_tmp12_) { |
2704 | + KkcTrellisNode* _tmp15_ = NULL; |
2705 | + if (!_tmp11_) { |
2706 | + KkcTrellisNode* _tmp12_ = NULL; |
2707 | KkcTrellisNode* _tmp13_ = NULL; |
2708 | KkcTrellisNode* _tmp14_ = NULL; |
2709 | - KkcTrellisNode* _tmp15_ = NULL; |
2710 | - _tmp13_ = node; |
2711 | - _tmp14_ = _tmp13_->previous; |
2712 | - _tmp15_ = _kkc_trellis_node_ref0 (_tmp14_); |
2713 | + _tmp12_ = node; |
2714 | + _tmp13_ = _tmp12_->previous; |
2715 | + _tmp14_ = _kkc_trellis_node_ref0 (_tmp13_); |
2716 | _kkc_trellis_node_unref0 (node); |
2717 | - node = _tmp15_; |
2718 | + node = _tmp14_; |
2719 | } |
2720 | _tmp11_ = FALSE; |
2721 | - _tmp16_ = node; |
2722 | - if (!(_tmp16_ != NULL)) { |
2723 | + _tmp15_ = node; |
2724 | + if (!(_tmp15_ != NULL)) { |
2725 | break; |
2726 | } |
2727 | { |
2728 | gint i = 0; |
2729 | - KkcTrellisNode* _tmp17_ = NULL; |
2730 | + KkcTrellisNode* _tmp16_ = NULL; |
2731 | + KkcLanguageModelEntry* _tmp17_ = NULL; |
2732 | + gint _tmp17__length1 = 0; |
2733 | KkcLanguageModelEntry* _tmp18_ = NULL; |
2734 | gint _tmp18__length1 = 0; |
2735 | - KkcLanguageModelEntry* _tmp19_ = NULL; |
2736 | - gint _tmp19__length1 = 0; |
2737 | - _tmp17_ = node; |
2738 | - _tmp18_ = kkc_trellis_node_get_entries (_tmp17_, &_tmp18__length1); |
2739 | - _tmp19_ = _tmp18_; |
2740 | - _tmp19__length1 = _tmp18__length1; |
2741 | - i = _tmp19__length1 - 1; |
2742 | + _tmp16_ = node; |
2743 | + _tmp17_ = kkc_trellis_node_get_entries (_tmp16_, &_tmp17__length1); |
2744 | + _tmp18_ = _tmp17_; |
2745 | + _tmp18__length1 = _tmp17__length1; |
2746 | + i = _tmp18__length1 - 1; |
2747 | { |
2748 | - gboolean _tmp20_ = FALSE; |
2749 | - _tmp20_ = TRUE; |
2750 | + gboolean _tmp19_ = FALSE; |
2751 | + _tmp19_ = TRUE; |
2752 | while (TRUE) { |
2753 | - gboolean _tmp21_ = FALSE; |
2754 | - gint _tmp23_ = 0; |
2755 | + gint _tmp21_ = 0; |
2756 | KkcLanguageModelEntry entry = {0}; |
2757 | - KkcTrellisNode* _tmp24_ = NULL; |
2758 | - KkcLanguageModelEntry* _tmp25_ = NULL; |
2759 | - gint _tmp25__length1 = 0; |
2760 | - KkcLanguageModelEntry* _tmp26_ = NULL; |
2761 | - gint _tmp26__length1 = 0; |
2762 | - gint _tmp27_ = 0; |
2763 | + KkcTrellisNode* _tmp22_ = NULL; |
2764 | + KkcLanguageModelEntry* _tmp23_ = NULL; |
2765 | + gint _tmp23__length1 = 0; |
2766 | + KkcLanguageModelEntry* _tmp24_ = NULL; |
2767 | + gint _tmp24__length1 = 0; |
2768 | + gint _tmp25_ = 0; |
2769 | + KkcLanguageModelEntry _tmp26_ = {0}; |
2770 | + KkcLanguageModelEntry _tmp27_ = {0}; |
2771 | KkcLanguageModelEntry _tmp28_ = {0}; |
2772 | - KkcLanguageModelEntry _tmp29_ = {0}; |
2773 | - KkcLanguageModelEntry _tmp30_ = {0}; |
2774 | - KkcBigramLanguageModel* _tmp31_ = NULL; |
2775 | - KkcBigramLanguageModel* _tmp32_ = NULL; |
2776 | + KkcBigramLanguageModel* _tmp29_ = NULL; |
2777 | + KkcBigramLanguageModel* _tmp30_ = NULL; |
2778 | + KkcLanguageModelEntry _tmp31_ = {0}; |
2779 | + KkcLanguageModelEntry _tmp32_ = {0}; |
2780 | KkcLanguageModelEntry _tmp33_ = {0}; |
2781 | - KkcLanguageModelEntry _tmp34_ = {0}; |
2782 | + const gchar* _tmp34_ = NULL; |
2783 | KkcLanguageModelEntry _tmp35_ = {0}; |
2784 | const gchar* _tmp36_ = NULL; |
2785 | - KkcLanguageModelEntry _tmp37_ = {0}; |
2786 | - const gchar* _tmp38_ = NULL; |
2787 | + KkcSegment* _tmp37_ = NULL; |
2788 | + KkcSegment* _tmp38_ = NULL; |
2789 | KkcSegment* _tmp39_ = NULL; |
2790 | KkcSegment* _tmp40_ = NULL; |
2791 | KkcSegment* _tmp41_ = NULL; |
2792 | KkcSegment* _tmp42_ = NULL; |
2793 | - KkcSegment* _tmp43_ = NULL; |
2794 | - KkcSegment* _tmp44_ = NULL; |
2795 | - _tmp21_ = _tmp20_; |
2796 | - if (!_tmp21_) { |
2797 | - gint _tmp22_ = 0; |
2798 | - _tmp22_ = i; |
2799 | - i = _tmp22_ - 1; |
2800 | + if (!_tmp19_) { |
2801 | + gint _tmp20_ = 0; |
2802 | + _tmp20_ = i; |
2803 | + i = _tmp20_ - 1; |
2804 | } |
2805 | - _tmp20_ = FALSE; |
2806 | - _tmp23_ = i; |
2807 | - if (!(_tmp23_ >= 0)) { |
2808 | + _tmp19_ = FALSE; |
2809 | + _tmp21_ = i; |
2810 | + if (!(_tmp21_ >= 0)) { |
2811 | break; |
2812 | } |
2813 | - _tmp24_ = node; |
2814 | - _tmp25_ = kkc_trellis_node_get_entries (_tmp24_, &_tmp25__length1); |
2815 | - _tmp26_ = _tmp25_; |
2816 | - _tmp26__length1 = _tmp25__length1; |
2817 | - _tmp27_ = i; |
2818 | - _tmp28_ = _tmp26_[_tmp27_]; |
2819 | - kkc_language_model_entry_copy (&_tmp28_, &_tmp29_); |
2820 | - entry = _tmp29_; |
2821 | - _tmp30_ = entry; |
2822 | - _tmp31_ = kkc_bigram_decoder_get_model (self); |
2823 | + _tmp22_ = node; |
2824 | + _tmp23_ = kkc_trellis_node_get_entries (_tmp22_, &_tmp23__length1); |
2825 | + _tmp24_ = _tmp23_; |
2826 | + _tmp24__length1 = _tmp23__length1; |
2827 | + _tmp25_ = i; |
2828 | + _tmp26_ = _tmp24_[_tmp25_]; |
2829 | + kkc_language_model_entry_copy (&_tmp26_, &_tmp27_); |
2830 | + entry = _tmp27_; |
2831 | + _tmp28_ = entry; |
2832 | + _tmp29_ = kkc_bigram_decoder_get_model (self); |
2833 | + _tmp30_ = _tmp29_; |
2834 | + kkc_language_model_get_bos ((KkcLanguageModel*) _tmp30_, &_tmp31_); |
2835 | _tmp32_ = _tmp31_; |
2836 | - kkc_language_model_get_bos ((KkcLanguageModel*) _tmp32_, &_tmp33_); |
2837 | - _tmp34_ = _tmp33_; |
2838 | - if (_kkc_language_model_entry_equal (&_tmp30_, &_tmp34_) == TRUE) { |
2839 | + if (_kkc_language_model_entry_equal (&_tmp28_, &_tmp32_) == TRUE) { |
2840 | kkc_language_model_entry_destroy (&entry); |
2841 | break; |
2842 | } |
2843 | + _tmp33_ = entry; |
2844 | + _tmp34_ = _tmp33_.input; |
2845 | _tmp35_ = entry; |
2846 | - _tmp36_ = _tmp35_.input; |
2847 | - _tmp37_ = entry; |
2848 | - _tmp38_ = _tmp37_.output; |
2849 | - _tmp39_ = kkc_segment_new (_tmp36_, _tmp38_); |
2850 | + _tmp36_ = _tmp35_.output; |
2851 | + _tmp37_ = kkc_segment_new (_tmp34_, _tmp36_); |
2852 | _g_object_unref0 (segment); |
2853 | - segment = _tmp39_; |
2854 | - _tmp40_ = segment; |
2855 | - _tmp41_ = next_segment; |
2856 | + segment = _tmp37_; |
2857 | + _tmp38_ = segment; |
2858 | + _tmp39_ = next_segment; |
2859 | + _tmp40_ = _g_object_ref0 (_tmp39_); |
2860 | + _g_object_unref0 (_tmp38_->next); |
2861 | + _tmp38_->next = _tmp40_; |
2862 | + _tmp41_ = segment; |
2863 | _tmp42_ = _g_object_ref0 (_tmp41_); |
2864 | - _g_object_unref0 (_tmp40_->next); |
2865 | - _tmp40_->next = _tmp42_; |
2866 | - _tmp43_ = segment; |
2867 | - _tmp44_ = _g_object_ref0 (_tmp43_); |
2868 | _g_object_unref0 (next_segment); |
2869 | - next_segment = _tmp44_; |
2870 | + next_segment = _tmp42_; |
2871 | kkc_language_model_entry_destroy (&entry); |
2872 | } |
2873 | } |
2874 | @@ -1905,281 +1868,275 @@ |
2875 | } |
2876 | _kkc_trellis_node_unref0 (node); |
2877 | } |
2878 | - _tmp45_ = segment; |
2879 | - _tmp46_ = _g_object_ref0 (_tmp45_); |
2880 | - _tmp47_ = g_new0 (KkcSegment*, 1 + 1); |
2881 | - _tmp47_[0] = _tmp46_; |
2882 | - _tmp48_ = _tmp47_; |
2883 | - _tmp48__length1 = 1; |
2884 | + _tmp43_ = segment; |
2885 | + _tmp44_ = _g_object_ref0 (_tmp43_); |
2886 | + _tmp45_ = g_new0 (KkcSegment*, 1 + 1); |
2887 | + _tmp45_[0] = _tmp44_; |
2888 | + _tmp46_ = _tmp45_; |
2889 | + _tmp46__length1 = 1; |
2890 | if (result_length1) { |
2891 | - *result_length1 = _tmp48__length1; |
2892 | + *result_length1 = _tmp46__length1; |
2893 | } |
2894 | - result = _tmp48_; |
2895 | + result = _tmp46_; |
2896 | _g_object_unref0 (next_segment); |
2897 | _g_object_unref0 (segment); |
2898 | _kkc_trellis_node_unref0 (eos_trellis_node); |
2899 | _kkc_trellis_node_unref0 (bos_trellis_node); |
2900 | return result; |
2901 | } |
2902 | - _tmp49_ = g_direct_hash; |
2903 | - _tmp50_ = g_direct_equal; |
2904 | - _tmp51_ = gee_hash_map_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, _tmp49_, _tmp50_, NULL); |
2905 | - trellis_nbest_map = _tmp51_; |
2906 | - _tmp52_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, (GCompareFunc) kkc_bigram_decoder_compare_nbest_node); |
2907 | - open_list = _tmp52_; |
2908 | - _tmp53_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, (GCompareFunc) kkc_bigram_decoder_compare_nbest_node); |
2909 | - close_list = _tmp53_; |
2910 | - _tmp54_ = g_str_hash; |
2911 | - _tmp55_ = g_str_equal; |
2912 | - _tmp56_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp54_, _tmp55_); |
2913 | - duplicates = _tmp56_; |
2914 | - _tmp57_ = eos_trellis_node; |
2915 | - _tmp58_ = kkc_nbest_node_new (_tmp57_); |
2916 | - eos_nbest_node = _tmp58_; |
2917 | - _tmp59_ = trellis_nbest_map; |
2918 | - _tmp60_ = eos_trellis_node; |
2919 | - _tmp61_ = eos_nbest_node; |
2920 | - gee_abstract_map_set ((GeeAbstractMap*) _tmp59_, _tmp60_, _tmp61_); |
2921 | - _tmp62_ = open_list; |
2922 | - _tmp63_ = eos_nbest_node; |
2923 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp62_, _tmp63_); |
2924 | + _tmp47_ = gee_hash_map_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); |
2925 | + trellis_nbest_map = _tmp47_; |
2926 | + _tmp48_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func, NULL, NULL); |
2927 | + open_list = _tmp48_; |
2928 | + _tmp49_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func, NULL, NULL); |
2929 | + close_list = _tmp49_; |
2930 | + _tmp50_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); |
2931 | + duplicates = _tmp50_; |
2932 | + _tmp51_ = eos_trellis_node; |
2933 | + _tmp52_ = kkc_nbest_node_new (_tmp51_); |
2934 | + eos_nbest_node = _tmp52_; |
2935 | + _tmp53_ = trellis_nbest_map; |
2936 | + _tmp54_ = eos_trellis_node; |
2937 | + _tmp55_ = eos_nbest_node; |
2938 | + gee_abstract_map_set ((GeeAbstractMap*) _tmp53_, _tmp54_, _tmp55_); |
2939 | + _tmp56_ = open_list; |
2940 | + _tmp57_ = eos_nbest_node; |
2941 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp56_, _tmp57_); |
2942 | while (TRUE) { |
2943 | - GeePriorityQueue* _tmp64_ = NULL; |
2944 | - gboolean _tmp65_ = FALSE; |
2945 | - gboolean _tmp66_ = FALSE; |
2946 | + GeePriorityQueue* _tmp58_ = NULL; |
2947 | + gboolean _tmp59_ = FALSE; |
2948 | + gboolean _tmp60_ = FALSE; |
2949 | KkcNbestNode* current_nbest_node = NULL; |
2950 | - GeePriorityQueue* _tmp67_ = NULL; |
2951 | - gpointer _tmp68_ = NULL; |
2952 | - KkcNbestNode* _tmp69_ = NULL; |
2953 | - KkcTrellisNode* _tmp70_ = NULL; |
2954 | - KkcTrellisNode* _tmp71_ = NULL; |
2955 | - _tmp64_ = open_list; |
2956 | - _tmp65_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp64_); |
2957 | - _tmp66_ = _tmp65_; |
2958 | - if (!(!_tmp66_)) { |
2959 | + GeePriorityQueue* _tmp61_ = NULL; |
2960 | + gpointer _tmp62_ = NULL; |
2961 | + KkcNbestNode* _tmp63_ = NULL; |
2962 | + KkcTrellisNode* _tmp64_ = NULL; |
2963 | + KkcTrellisNode* _tmp65_ = NULL; |
2964 | + _tmp58_ = open_list; |
2965 | + _tmp59_ = gee_collection_get_is_empty ((GeeCollection*) _tmp58_); |
2966 | + _tmp60_ = _tmp59_; |
2967 | + if (!(!_tmp60_)) { |
2968 | break; |
2969 | } |
2970 | - _tmp67_ = open_list; |
2971 | - _tmp68_ = gee_abstract_queue_poll ((GeeAbstractQueue*) _tmp67_); |
2972 | - current_nbest_node = (KkcNbestNode*) _tmp68_; |
2973 | - _tmp69_ = current_nbest_node; |
2974 | - _tmp70_ = _tmp69_->node; |
2975 | - _tmp71_ = bos_trellis_node; |
2976 | - if (_tmp70_ == _tmp71_) { |
2977 | + _tmp61_ = open_list; |
2978 | + _tmp62_ = gee_abstract_queue_poll ((GeeAbstractQueue*) _tmp61_); |
2979 | + current_nbest_node = (KkcNbestNode*) _tmp62_; |
2980 | + _tmp63_ = current_nbest_node; |
2981 | + _tmp64_ = _tmp63_->node; |
2982 | + _tmp65_ = bos_trellis_node; |
2983 | + if (_tmp64_ == _tmp65_) { |
2984 | gchar* output = NULL; |
2985 | - KkcNbestNode* _tmp72_ = NULL; |
2986 | - gchar* _tmp73_ = NULL; |
2987 | - GeeHashSet* _tmp74_ = NULL; |
2988 | - const gchar* _tmp75_ = NULL; |
2989 | - gboolean _tmp76_ = FALSE; |
2990 | - _tmp72_ = current_nbest_node; |
2991 | - _tmp73_ = kkc_bigram_decoder_concat_nbest_node_outputs (self, _tmp72_); |
2992 | - output = _tmp73_; |
2993 | - _tmp74_ = duplicates; |
2994 | - _tmp75_ = output; |
2995 | - _tmp76_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp74_, _tmp75_); |
2996 | - if (!_tmp76_) { |
2997 | - KkcTrellisNode* _tmp77_ = NULL; |
2998 | - gdouble _tmp78_ = 0.0; |
2999 | - KkcNbestNode* _tmp79_ = NULL; |
3000 | - gdouble _tmp80_ = 0.0; |
3001 | - gdouble _tmp81_ = 0.0; |
3002 | - GeePriorityQueue* _tmp82_ = NULL; |
3003 | - KkcNbestNode* _tmp83_ = NULL; |
3004 | - GeePriorityQueue* _tmp84_ = NULL; |
3005 | - gint _tmp85_ = 0; |
3006 | - gint _tmp86_ = 0; |
3007 | - gint _tmp87_ = 0; |
3008 | - GeeHashSet* _tmp88_ = NULL; |
3009 | - const gchar* _tmp89_ = NULL; |
3010 | - _tmp77_ = eos_trellis_node; |
3011 | - _tmp78_ = _tmp77_->cumulative_cost; |
3012 | - _tmp79_ = current_nbest_node; |
3013 | - _tmp80_ = _tmp79_->fn; |
3014 | - _tmp81_ = max_distance; |
3015 | - if ((_tmp78_ - _tmp80_) > _tmp81_) { |
3016 | - _g_free0 (output); |
3017 | - _kkc_nbest_node_unref0 (current_nbest_node); |
3018 | - break; |
3019 | - } |
3020 | - _tmp82_ = close_list; |
3021 | - _tmp83_ = current_nbest_node; |
3022 | + KkcNbestNode* _tmp66_ = NULL; |
3023 | + gchar* _tmp67_ = NULL; |
3024 | + GeeHashSet* _tmp68_ = NULL; |
3025 | + const gchar* _tmp69_ = NULL; |
3026 | + gboolean _tmp70_ = FALSE; |
3027 | + _tmp66_ = current_nbest_node; |
3028 | + _tmp67_ = kkc_bigram_decoder_concat_nbest_node_outputs (self, _tmp66_); |
3029 | + output = _tmp67_; |
3030 | + _tmp68_ = duplicates; |
3031 | + _tmp69_ = output; |
3032 | + _tmp70_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp68_, _tmp69_); |
3033 | + if (!_tmp70_) { |
3034 | + KkcTrellisNode* _tmp71_ = NULL; |
3035 | + gdouble _tmp72_ = 0.0; |
3036 | + KkcNbestNode* _tmp73_ = NULL; |
3037 | + gdouble _tmp74_ = 0.0; |
3038 | + gdouble _tmp75_ = 0.0; |
3039 | + GeePriorityQueue* _tmp76_ = NULL; |
3040 | + KkcNbestNode* _tmp77_ = NULL; |
3041 | + GeePriorityQueue* _tmp78_ = NULL; |
3042 | + gint _tmp79_ = 0; |
3043 | + gint _tmp80_ = 0; |
3044 | + gint _tmp81_ = 0; |
3045 | + GeeHashSet* _tmp82_ = NULL; |
3046 | + const gchar* _tmp83_ = NULL; |
3047 | + _tmp71_ = eos_trellis_node; |
3048 | + _tmp72_ = _tmp71_->cumulative_cost; |
3049 | + _tmp73_ = current_nbest_node; |
3050 | + _tmp74_ = _tmp73_->fn; |
3051 | + _tmp75_ = max_distance; |
3052 | + if ((_tmp72_ - _tmp74_) > _tmp75_) { |
3053 | + _g_free0 (output); |
3054 | + _kkc_nbest_node_unref0 (current_nbest_node); |
3055 | + break; |
3056 | + } |
3057 | + _tmp76_ = close_list; |
3058 | + _tmp77_ = current_nbest_node; |
3059 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp76_, _tmp77_); |
3060 | + _tmp78_ = close_list; |
3061 | + _tmp79_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp78_); |
3062 | + _tmp80_ = _tmp79_; |
3063 | + _tmp81_ = nbest; |
3064 | + if (_tmp80_ == _tmp81_) { |
3065 | + _g_free0 (output); |
3066 | + _kkc_nbest_node_unref0 (current_nbest_node); |
3067 | + break; |
3068 | + } |
3069 | + _tmp82_ = duplicates; |
3070 | + _tmp83_ = output; |
3071 | gee_abstract_collection_add ((GeeAbstractCollection*) _tmp82_, _tmp83_); |
3072 | - _tmp84_ = close_list; |
3073 | - _tmp85_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp84_); |
3074 | - _tmp86_ = _tmp85_; |
3075 | - _tmp87_ = nbest; |
3076 | - if (_tmp86_ == _tmp87_) { |
3077 | - _g_free0 (output); |
3078 | - _kkc_nbest_node_unref0 (current_nbest_node); |
3079 | - break; |
3080 | - } |
3081 | - _tmp88_ = duplicates; |
3082 | - _tmp89_ = output; |
3083 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp88_, _tmp89_); |
3084 | } |
3085 | _g_free0 (output); |
3086 | } else { |
3087 | - KkcNbestNode* _tmp90_ = NULL; |
3088 | - KkcTrellisNode* _tmp91_ = NULL; |
3089 | - guint _tmp92_ = 0U; |
3090 | - guint _tmp93_ = 0U; |
3091 | - KkcNbestNode* _tmp94_ = NULL; |
3092 | - KkcTrellisNode* _tmp95_ = NULL; |
3093 | - guint _tmp96_ = 0U; |
3094 | - guint _tmp97_ = 0U; |
3095 | - _tmp90_ = current_nbest_node; |
3096 | - _tmp91_ = _tmp90_->node; |
3097 | - _tmp92_ = kkc_trellis_node_get_endpos (_tmp91_); |
3098 | - _tmp93_ = _tmp92_; |
3099 | - _tmp94_ = current_nbest_node; |
3100 | - _tmp95_ = _tmp94_->node; |
3101 | - _tmp96_ = kkc_trellis_node_get_length (_tmp95_); |
3102 | - _tmp97_ = _tmp96_; |
3103 | - if (_tmp93_ >= _tmp97_) { |
3104 | + KkcNbestNode* _tmp84_ = NULL; |
3105 | + KkcTrellisNode* _tmp85_ = NULL; |
3106 | + guint _tmp86_ = 0U; |
3107 | + guint _tmp87_ = 0U; |
3108 | + KkcNbestNode* _tmp88_ = NULL; |
3109 | + KkcTrellisNode* _tmp89_ = NULL; |
3110 | + guint _tmp90_ = 0U; |
3111 | + guint _tmp91_ = 0U; |
3112 | + _tmp84_ = current_nbest_node; |
3113 | + _tmp85_ = _tmp84_->node; |
3114 | + _tmp86_ = kkc_trellis_node_get_endpos (_tmp85_); |
3115 | + _tmp87_ = _tmp86_; |
3116 | + _tmp88_ = current_nbest_node; |
3117 | + _tmp89_ = _tmp88_->node; |
3118 | + _tmp90_ = kkc_trellis_node_get_length (_tmp89_); |
3119 | + _tmp91_ = _tmp90_; |
3120 | + if (_tmp87_ >= _tmp91_) { |
3121 | guint i = 0U; |
3122 | - KkcNbestNode* _tmp98_ = NULL; |
3123 | - KkcTrellisNode* _tmp99_ = NULL; |
3124 | - guint _tmp100_ = 0U; |
3125 | - guint _tmp101_ = 0U; |
3126 | - KkcNbestNode* _tmp102_ = NULL; |
3127 | - KkcTrellisNode* _tmp103_ = NULL; |
3128 | - guint _tmp104_ = 0U; |
3129 | - guint _tmp105_ = 0U; |
3130 | - _tmp98_ = current_nbest_node; |
3131 | - _tmp99_ = _tmp98_->node; |
3132 | - _tmp100_ = kkc_trellis_node_get_endpos (_tmp99_); |
3133 | - _tmp101_ = _tmp100_; |
3134 | - _tmp102_ = current_nbest_node; |
3135 | - _tmp103_ = _tmp102_->node; |
3136 | - _tmp104_ = kkc_trellis_node_get_length (_tmp103_); |
3137 | - _tmp105_ = _tmp104_; |
3138 | - i = ((gint) _tmp101_) - _tmp105_; |
3139 | + KkcNbestNode* _tmp92_ = NULL; |
3140 | + KkcTrellisNode* _tmp93_ = NULL; |
3141 | + guint _tmp94_ = 0U; |
3142 | + guint _tmp95_ = 0U; |
3143 | + KkcNbestNode* _tmp96_ = NULL; |
3144 | + KkcTrellisNode* _tmp97_ = NULL; |
3145 | + guint _tmp98_ = 0U; |
3146 | + guint _tmp99_ = 0U; |
3147 | + _tmp92_ = current_nbest_node; |
3148 | + _tmp93_ = _tmp92_->node; |
3149 | + _tmp94_ = kkc_trellis_node_get_endpos (_tmp93_); |
3150 | + _tmp95_ = _tmp94_; |
3151 | + _tmp96_ = current_nbest_node; |
3152 | + _tmp97_ = _tmp96_->node; |
3153 | + _tmp98_ = kkc_trellis_node_get_length (_tmp97_); |
3154 | + _tmp99_ = _tmp98_; |
3155 | + i = ((gint) _tmp95_) - _tmp99_; |
3156 | { |
3157 | GeeArrayList* _trellis_node_list = NULL; |
3158 | - GeeArrayList** _tmp106_ = NULL; |
3159 | - gint _tmp106__length1 = 0; |
3160 | - guint _tmp107_ = 0U; |
3161 | - GeeArrayList* _tmp108_ = NULL; |
3162 | - GeeArrayList* _tmp109_ = NULL; |
3163 | + GeeArrayList** _tmp100_ = NULL; |
3164 | + gint _tmp100__length1 = 0; |
3165 | + guint _tmp101_ = 0U; |
3166 | + GeeArrayList* _tmp102_ = NULL; |
3167 | + GeeArrayList* _tmp103_ = NULL; |
3168 | gint _trellis_node_size = 0; |
3169 | - GeeArrayList* _tmp110_ = NULL; |
3170 | - gint _tmp111_ = 0; |
3171 | - gint _tmp112_ = 0; |
3172 | + GeeArrayList* _tmp104_ = NULL; |
3173 | + gint _tmp105_ = 0; |
3174 | + gint _tmp106_ = 0; |
3175 | gint _trellis_node_index = 0; |
3176 | - _tmp106_ = trellis; |
3177 | - _tmp106__length1 = trellis_length1; |
3178 | - _tmp107_ = i; |
3179 | - _tmp108_ = _tmp106_[_tmp107_]; |
3180 | - _tmp109_ = _g_object_ref0 (_tmp108_); |
3181 | - _trellis_node_list = _tmp109_; |
3182 | - _tmp110_ = _trellis_node_list; |
3183 | - _tmp111_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp110_); |
3184 | - _tmp112_ = _tmp111_; |
3185 | - _trellis_node_size = _tmp112_; |
3186 | + _tmp100_ = trellis; |
3187 | + _tmp100__length1 = trellis_length1; |
3188 | + _tmp101_ = i; |
3189 | + _tmp102_ = _tmp100_[_tmp101_]; |
3190 | + _tmp103_ = _g_object_ref0 (_tmp102_); |
3191 | + _trellis_node_list = _tmp103_; |
3192 | + _tmp104_ = _trellis_node_list; |
3193 | + _tmp105_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp104_); |
3194 | + _tmp106_ = _tmp105_; |
3195 | + _trellis_node_size = _tmp106_; |
3196 | _trellis_node_index = -1; |
3197 | while (TRUE) { |
3198 | - gint _tmp113_ = 0; |
3199 | - gint _tmp114_ = 0; |
3200 | - gint _tmp115_ = 0; |
3201 | + gint _tmp107_ = 0; |
3202 | + gint _tmp108_ = 0; |
3203 | + gint _tmp109_ = 0; |
3204 | KkcTrellisNode* trellis_node = NULL; |
3205 | - GeeArrayList* _tmp116_ = NULL; |
3206 | - gint _tmp117_ = 0; |
3207 | - gpointer _tmp118_ = NULL; |
3208 | + GeeArrayList* _tmp110_ = NULL; |
3209 | + gint _tmp111_ = 0; |
3210 | + gpointer _tmp112_ = NULL; |
3211 | KkcNbestNode* nbest_node = NULL; |
3212 | - KkcTrellisNode* _tmp119_ = NULL; |
3213 | - KkcNbestNode* _tmp120_ = NULL; |
3214 | + KkcTrellisNode* _tmp113_ = NULL; |
3215 | + KkcNbestNode* _tmp114_ = NULL; |
3216 | gdouble cost = 0.0; |
3217 | - KkcNbestNode* _tmp121_ = NULL; |
3218 | + KkcNbestNode* _tmp115_ = NULL; |
3219 | + KkcTrellisNode* _tmp116_ = NULL; |
3220 | + KkcNbestNode* _tmp117_ = NULL; |
3221 | + KkcTrellisNode* _tmp118_ = NULL; |
3222 | + guint _tmp119_ = 0U; |
3223 | + gdouble _tmp120_ = 0.0; |
3224 | + gboolean _tmp121_ = FALSE; |
3225 | KkcTrellisNode* _tmp122_ = NULL; |
3226 | - KkcNbestNode* _tmp123_ = NULL; |
3227 | - KkcTrellisNode* _tmp124_ = NULL; |
3228 | - guint _tmp125_ = 0U; |
3229 | - gdouble _tmp126_ = 0.0; |
3230 | - gboolean _tmp127_ = FALSE; |
3231 | - KkcTrellisNode* _tmp128_ = NULL; |
3232 | - KkcTrellisNode* _tmp129_ = NULL; |
3233 | - gboolean _tmp132_ = FALSE; |
3234 | + KkcTrellisNode* _tmp123_ = NULL; |
3235 | + KkcNbestNode* _tmp126_ = NULL; |
3236 | + gdouble _tmp127_ = 0.0; |
3237 | + KkcNbestNode* _tmp128_ = NULL; |
3238 | + gdouble _tmp129_ = 0.0; |
3239 | + KkcNbestNode* _tmp130_ = NULL; |
3240 | + KkcNbestNode* _tmp131_ = NULL; |
3241 | + gdouble _tmp132_ = 0.0; |
3242 | KkcNbestNode* _tmp133_ = NULL; |
3243 | - gdouble _tmp134_ = 0.0; |
3244 | - KkcNbestNode* _tmp135_ = NULL; |
3245 | - gdouble _tmp136_ = 0.0; |
3246 | + KkcTrellisNode* _tmp134_ = NULL; |
3247 | + gdouble _tmp135_ = 0.0; |
3248 | + KkcNbestNode* _tmp136_ = NULL; |
3249 | KkcNbestNode* _tmp137_ = NULL; |
3250 | KkcNbestNode* _tmp138_ = NULL; |
3251 | - gdouble _tmp139_ = 0.0; |
3252 | - KkcNbestNode* _tmp140_ = NULL; |
3253 | - KkcTrellisNode* _tmp141_ = NULL; |
3254 | - gdouble _tmp142_ = 0.0; |
3255 | + GeeHashMap* _tmp139_ = NULL; |
3256 | + KkcTrellisNode* _tmp140_ = NULL; |
3257 | + KkcNbestNode* _tmp141_ = NULL; |
3258 | + GeePriorityQueue* _tmp142_ = NULL; |
3259 | KkcNbestNode* _tmp143_ = NULL; |
3260 | - KkcNbestNode* _tmp144_ = NULL; |
3261 | - KkcNbestNode* _tmp145_ = NULL; |
3262 | - GeeHashMap* _tmp146_ = NULL; |
3263 | - KkcTrellisNode* _tmp147_ = NULL; |
3264 | - KkcNbestNode* _tmp148_ = NULL; |
3265 | - GeePriorityQueue* _tmp149_ = NULL; |
3266 | - KkcNbestNode* _tmp150_ = NULL; |
3267 | - _tmp113_ = _trellis_node_index; |
3268 | - _trellis_node_index = _tmp113_ + 1; |
3269 | - _tmp114_ = _trellis_node_index; |
3270 | - _tmp115_ = _trellis_node_size; |
3271 | - if (!(_tmp114_ < _tmp115_)) { |
3272 | + _tmp107_ = _trellis_node_index; |
3273 | + _trellis_node_index = _tmp107_ + 1; |
3274 | + _tmp108_ = _trellis_node_index; |
3275 | + _tmp109_ = _trellis_node_size; |
3276 | + if (!(_tmp108_ < _tmp109_)) { |
3277 | break; |
3278 | } |
3279 | - _tmp116_ = _trellis_node_list; |
3280 | - _tmp117_ = _trellis_node_index; |
3281 | - _tmp118_ = gee_abstract_list_get ((GeeAbstractList*) _tmp116_, _tmp117_); |
3282 | - trellis_node = (KkcTrellisNode*) _tmp118_; |
3283 | - _tmp119_ = trellis_node; |
3284 | - _tmp120_ = kkc_nbest_node_new (_tmp119_); |
3285 | - nbest_node = _tmp120_; |
3286 | - _tmp121_ = nbest_node; |
3287 | - _tmp122_ = _tmp121_->node; |
3288 | - _tmp123_ = current_nbest_node; |
3289 | - _tmp124_ = _tmp123_->node; |
3290 | - _tmp125_ = i; |
3291 | - _tmp126_ = kkc_bigram_decoder_path_cost (self, _tmp122_, _tmp124_, (gint) _tmp125_); |
3292 | - cost = _tmp126_; |
3293 | - _tmp128_ = trellis_node; |
3294 | - _tmp129_ = bos_trellis_node; |
3295 | - if (_tmp128_ != _tmp129_) { |
3296 | - gdouble _tmp130_ = 0.0; |
3297 | - gdouble _tmp131_ = 0.0; |
3298 | - _tmp130_ = cost; |
3299 | - _tmp131_ = min_path_cost; |
3300 | - _tmp127_ = _tmp130_ < _tmp131_; |
3301 | + _tmp110_ = _trellis_node_list; |
3302 | + _tmp111_ = _trellis_node_index; |
3303 | + _tmp112_ = gee_abstract_list_get ((GeeAbstractList*) _tmp110_, _tmp111_); |
3304 | + trellis_node = (KkcTrellisNode*) _tmp112_; |
3305 | + _tmp113_ = trellis_node; |
3306 | + _tmp114_ = kkc_nbest_node_new (_tmp113_); |
3307 | + nbest_node = _tmp114_; |
3308 | + _tmp115_ = nbest_node; |
3309 | + _tmp116_ = _tmp115_->node; |
3310 | + _tmp117_ = current_nbest_node; |
3311 | + _tmp118_ = _tmp117_->node; |
3312 | + _tmp119_ = i; |
3313 | + _tmp120_ = kkc_bigram_decoder_path_cost (self, _tmp116_, _tmp118_, (gint) _tmp119_); |
3314 | + cost = _tmp120_; |
3315 | + _tmp122_ = trellis_node; |
3316 | + _tmp123_ = bos_trellis_node; |
3317 | + if (_tmp122_ != _tmp123_) { |
3318 | + gdouble _tmp124_ = 0.0; |
3319 | + gdouble _tmp125_ = 0.0; |
3320 | + _tmp124_ = cost; |
3321 | + _tmp125_ = min_path_cost; |
3322 | + _tmp121_ = _tmp124_ < _tmp125_; |
3323 | } else { |
3324 | - _tmp127_ = FALSE; |
3325 | + _tmp121_ = FALSE; |
3326 | } |
3327 | - _tmp132_ = _tmp127_; |
3328 | - if (_tmp132_) { |
3329 | + if (_tmp121_) { |
3330 | _kkc_nbest_node_unref0 (nbest_node); |
3331 | _kkc_trellis_node_unref0 (trellis_node); |
3332 | continue; |
3333 | } |
3334 | + _tmp126_ = nbest_node; |
3335 | + _tmp127_ = cost; |
3336 | + _tmp128_ = current_nbest_node; |
3337 | + _tmp129_ = _tmp128_->gn; |
3338 | + _tmp126_->gn = _tmp127_ + _tmp129_; |
3339 | + _tmp130_ = nbest_node; |
3340 | + _tmp131_ = nbest_node; |
3341 | + _tmp132_ = _tmp131_->gn; |
3342 | _tmp133_ = nbest_node; |
3343 | - _tmp134_ = cost; |
3344 | - _tmp135_ = current_nbest_node; |
3345 | - _tmp136_ = _tmp135_->gn; |
3346 | - _tmp133_->gn = _tmp134_ + _tmp136_; |
3347 | - _tmp137_ = nbest_node; |
3348 | - _tmp138_ = nbest_node; |
3349 | - _tmp139_ = _tmp138_->gn; |
3350 | - _tmp140_ = nbest_node; |
3351 | - _tmp141_ = _tmp140_->node; |
3352 | - _tmp142_ = _tmp141_->cumulative_cost; |
3353 | - _tmp137_->fn = _tmp139_ + _tmp142_; |
3354 | + _tmp134_ = _tmp133_->node; |
3355 | + _tmp135_ = _tmp134_->cumulative_cost; |
3356 | + _tmp130_->fn = _tmp132_ + _tmp135_; |
3357 | + _tmp136_ = nbest_node; |
3358 | + _tmp137_ = current_nbest_node; |
3359 | + _tmp138_ = _kkc_nbest_node_ref0 (_tmp137_); |
3360 | + _kkc_nbest_node_unref0 (_tmp136_->next); |
3361 | + _tmp136_->next = _tmp138_; |
3362 | + _tmp139_ = trellis_nbest_map; |
3363 | + _tmp140_ = trellis_node; |
3364 | + _tmp141_ = nbest_node; |
3365 | + gee_abstract_map_set ((GeeAbstractMap*) _tmp139_, _tmp140_, _tmp141_); |
3366 | + _tmp142_ = open_list; |
3367 | _tmp143_ = nbest_node; |
3368 | - _tmp144_ = current_nbest_node; |
3369 | - _tmp145_ = _kkc_nbest_node_ref0 (_tmp144_); |
3370 | - _kkc_nbest_node_unref0 (_tmp143_->next); |
3371 | - _tmp143_->next = _tmp145_; |
3372 | - _tmp146_ = trellis_nbest_map; |
3373 | - _tmp147_ = trellis_node; |
3374 | - _tmp148_ = nbest_node; |
3375 | - gee_abstract_map_set ((GeeAbstractMap*) _tmp146_, _tmp147_, _tmp148_); |
3376 | - _tmp149_ = open_list; |
3377 | - _tmp150_ = nbest_node; |
3378 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp149_, _tmp150_); |
3379 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp142_, _tmp143_); |
3380 | _kkc_nbest_node_unref0 (nbest_node); |
3381 | _kkc_trellis_node_unref0 (trellis_node); |
3382 | } |
3383 | @@ -2189,53 +2146,53 @@ |
3384 | } |
3385 | _kkc_nbest_node_unref0 (current_nbest_node); |
3386 | } |
3387 | - _tmp151_ = gee_array_list_new (KKC_TYPE_SEGMENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); |
3388 | - segments = _tmp151_; |
3389 | + _tmp144_ = gee_array_list_new (KKC_TYPE_SEGMENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); |
3390 | + segments = _tmp144_; |
3391 | { |
3392 | GeeIterator* _nbest_node_it = NULL; |
3393 | - GeePriorityQueue* _tmp152_ = NULL; |
3394 | - GeeIterator* _tmp153_ = NULL; |
3395 | - _tmp152_ = close_list; |
3396 | - _tmp153_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _tmp152_); |
3397 | - _nbest_node_it = _tmp153_; |
3398 | + GeePriorityQueue* _tmp145_ = NULL; |
3399 | + GeeIterator* _tmp146_ = NULL; |
3400 | + _tmp145_ = close_list; |
3401 | + _tmp146_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _tmp145_); |
3402 | + _nbest_node_it = _tmp146_; |
3403 | while (TRUE) { |
3404 | - GeeIterator* _tmp154_ = NULL; |
3405 | - gboolean _tmp155_ = FALSE; |
3406 | + GeeIterator* _tmp147_ = NULL; |
3407 | + gboolean _tmp148_ = FALSE; |
3408 | KkcNbestNode* nbest_node = NULL; |
3409 | - GeeIterator* _tmp156_ = NULL; |
3410 | - gpointer _tmp157_ = NULL; |
3411 | - GeeArrayList* _tmp158_ = NULL; |
3412 | - KkcNbestNode* _tmp159_ = NULL; |
3413 | - KkcNbestNode* _tmp160_ = NULL; |
3414 | - KkcSegment* _tmp161_ = NULL; |
3415 | - KkcSegment* _tmp162_ = NULL; |
3416 | - _tmp154_ = _nbest_node_it; |
3417 | - _tmp155_ = gee_iterator_next (_tmp154_); |
3418 | - if (!_tmp155_) { |
3419 | + GeeIterator* _tmp149_ = NULL; |
3420 | + gpointer _tmp150_ = NULL; |
3421 | + GeeArrayList* _tmp151_ = NULL; |
3422 | + KkcNbestNode* _tmp152_ = NULL; |
3423 | + KkcNbestNode* _tmp153_ = NULL; |
3424 | + KkcSegment* _tmp154_ = NULL; |
3425 | + KkcSegment* _tmp155_ = NULL; |
3426 | + _tmp147_ = _nbest_node_it; |
3427 | + _tmp148_ = gee_iterator_next (_tmp147_); |
3428 | + if (!_tmp148_) { |
3429 | break; |
3430 | } |
3431 | - _tmp156_ = _nbest_node_it; |
3432 | - _tmp157_ = gee_iterator_get (_tmp156_); |
3433 | - nbest_node = (KkcNbestNode*) _tmp157_; |
3434 | - _tmp158_ = segments; |
3435 | - _tmp159_ = nbest_node; |
3436 | - _tmp160_ = _tmp159_->next; |
3437 | - _tmp161_ = kkc_bigram_decoder_nbest_node_to_segment (self, _tmp160_); |
3438 | - _tmp162_ = _tmp161_; |
3439 | - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp158_, _tmp162_); |
3440 | - _g_object_unref0 (_tmp162_); |
3441 | + _tmp149_ = _nbest_node_it; |
3442 | + _tmp150_ = gee_iterator_get (_tmp149_); |
3443 | + nbest_node = (KkcNbestNode*) _tmp150_; |
3444 | + _tmp151_ = segments; |
3445 | + _tmp152_ = nbest_node; |
3446 | + _tmp153_ = _tmp152_->next; |
3447 | + _tmp154_ = kkc_bigram_decoder_nbest_node_to_segment (self, _tmp153_); |
3448 | + _tmp155_ = _tmp154_; |
3449 | + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp151_, _tmp155_); |
3450 | + _g_object_unref0 (_tmp155_); |
3451 | _kkc_nbest_node_unref0 (nbest_node); |
3452 | } |
3453 | _g_object_unref0 (_nbest_node_it); |
3454 | } |
3455 | - _tmp163_ = segments; |
3456 | - _tmp165_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp163_, &_tmp164_); |
3457 | - _tmp166_ = _tmp165_; |
3458 | - _tmp166__length1 = _tmp164_; |
3459 | + _tmp156_ = segments; |
3460 | + _tmp158_ = gee_collection_to_array ((GeeCollection*) _tmp156_, &_tmp157_); |
3461 | + _tmp159_ = _tmp158_; |
3462 | + _tmp159__length1 = _tmp157_; |
3463 | if (result_length1) { |
3464 | - *result_length1 = _tmp166__length1; |
3465 | + *result_length1 = _tmp159__length1; |
3466 | } |
3467 | - result = _tmp166_; |
3468 | + result = _tmp159_; |
3469 | _g_object_unref0 (segments); |
3470 | _kkc_nbest_node_unref0 (eos_nbest_node); |
3471 | _g_object_unref0 (duplicates); |
3472 | @@ -2358,9 +2315,9 @@ |
3473 | static void kkc_bigram_decoder_class_init (KkcBigramDecoderClass * klass) { |
3474 | kkc_bigram_decoder_parent_class = g_type_class_peek_parent (klass); |
3475 | g_type_class_add_private (klass, sizeof (KkcBigramDecoderPrivate)); |
3476 | - KKC_DECODER_CLASS (klass)->decode = kkc_bigram_decoder_real_decode; |
3477 | - KKC_DECODER_CLASS (klass)->decode_with_costs = kkc_bigram_decoder_real_decode_with_costs; |
3478 | - KKC_BIGRAM_DECODER_CLASS (klass)->path_cost = kkc_bigram_decoder_real_path_cost; |
3479 | + ((KkcDecoderClass *) klass)->decode = kkc_bigram_decoder_real_decode; |
3480 | + ((KkcDecoderClass *) klass)->decode_with_costs = kkc_bigram_decoder_real_decode_with_costs; |
3481 | + ((KkcBigramDecoderClass *) klass)->path_cost = kkc_bigram_decoder_real_path_cost; |
3482 | G_OBJECT_CLASS (klass)->get_property = _vala_kkc_bigram_decoder_get_property; |
3483 | G_OBJECT_CLASS (klass)->finalize = kkc_bigram_decoder_finalize; |
3484 | g_object_class_install_property (G_OBJECT_CLASS (klass), KKC_BIGRAM_DECODER_MODEL, g_param_spec_object ("model", "model", "model", KKC_TYPE_BIGRAM_LANGUAGE_MODEL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); |
3485 | |
3486 | === modified file 'libkkc/bigram-decoder.vala' |
3487 | --- libkkc/bigram-decoder.vala 2014-02-26 22:51:39 +0000 |
3488 | +++ libkkc/bigram-decoder.vala 2014-10-01 15:12:30 +0000 |
3489 | @@ -1,6 +1,6 @@ |
3490 | /* |
3491 | - * Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
3492 | - * Copyright (C) 2012-2013 Red Hat, Inc. |
3493 | + * Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
3494 | + * Copyright (C) 2012-2014 Red Hat, Inc. |
3495 | * |
3496 | * This program is free software: you can redistribute it and/or modify |
3497 | * it under the terms of the GNU General Public License as published by |
3498 | @@ -228,17 +228,13 @@ |
3499 | return new Segment[] { segment }; |
3500 | } |
3501 | |
3502 | - var trellis_nbest_map = new HashMap<TrellisNode,NbestNode> ( |
3503 | - direct_hash, |
3504 | - direct_equal); |
3505 | - |
3506 | - var open_list = new PriorityQueue<NbestNode> ( |
3507 | - (CompareFunc)compare_nbest_node); |
3508 | - |
3509 | - var close_list = new PriorityQueue<NbestNode> ( |
3510 | - (CompareFunc)compare_nbest_node); |
3511 | - |
3512 | - var duplicates = new HashSet<string> (str_hash, str_equal); |
3513 | + var trellis_nbest_map = new HashMap<TrellisNode,NbestNode> (); |
3514 | + |
3515 | + var open_list = new PriorityQueue<NbestNode> (compare_nbest_node); |
3516 | + |
3517 | + var close_list = new PriorityQueue<NbestNode> (compare_nbest_node); |
3518 | + |
3519 | + var duplicates = new Gee.HashSet<string> (); |
3520 | |
3521 | var eos_nbest_node = new NbestNode (eos_trellis_node); |
3522 | trellis_nbest_map.set (eos_trellis_node, eos_nbest_node); |
3523 | |
3524 | === modified file 'libkkc/bloom-filter.c' |
3525 | --- libkkc/bloom-filter.c 2014-06-15 23:27:57 +0000 |
3526 | +++ libkkc/bloom-filter.c 2014-10-01 15:12:30 +0000 |
3527 | @@ -1,9 +1,9 @@ |
3528 | -/* bloom-filter.c generated by valac 0.22.1, the Vala compiler |
3529 | +/* bloom-filter.c generated by valac 0.24.0.131-42e78, the Vala compiler |
3530 | * generated from bloom-filter.vala, do not modify */ |
3531 | |
3532 | /* |
3533 | - * Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
3534 | - * Copyright (C) 2012-2013 Red Hat, Inc. |
3535 | + * Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
3536 | + * Copyright (C) 2012-2014 Red Hat, Inc. |
3537 | * |
3538 | * This program is free software: you can redistribute it and/or modify |
3539 | * it under the terms of the GNU General Public License as published by |
3540 | @@ -160,19 +160,23 @@ |
3541 | GMappedFile* _tmp0_ = NULL; |
3542 | const gchar* _tmp1_ = NULL; |
3543 | GMappedFile* _tmp2_ = NULL; |
3544 | + GMappedFile* _tmp3_ = NULL; |
3545 | GError * _inner_error_ = NULL; |
3546 | g_return_val_if_fail (filename != NULL, NULL); |
3547 | self = (KkcBloomFilter*) g_object_new (object_type, NULL); |
3548 | _tmp1_ = filename; |
3549 | _tmp2_ = g_mapped_file_new (_tmp1_, FALSE, &_inner_error_); |
3550 | _tmp0_ = _tmp2_; |
3551 | - if (_inner_error_ != NULL) { |
3552 | + if (G_UNLIKELY (_inner_error_ != NULL)) { |
3553 | g_propagate_error (error, _inner_error_); |
3554 | _g_object_unref0 (self); |
3555 | return NULL; |
3556 | } |
3557 | + _tmp3_ = _tmp0_; |
3558 | + _tmp0_ = NULL; |
3559 | _g_mapped_file_unref0 (self->priv->mmap); |
3560 | - self->priv->mmap = _tmp0_; |
3561 | + self->priv->mmap = _tmp3_; |
3562 | + _g_mapped_file_unref0 (_tmp0_); |
3563 | return self; |
3564 | } |
3565 | |
3566 | @@ -217,42 +221,40 @@ |
3567 | gboolean _tmp0_ = FALSE; |
3568 | _tmp0_ = TRUE; |
3569 | while (TRUE) { |
3570 | - gboolean _tmp1_ = FALSE; |
3571 | - gint _tmp3_ = 0; |
3572 | + gint _tmp2_ = 0; |
3573 | guint32 h = 0U; |
3574 | + guint32 _tmp3_ = 0U; |
3575 | guint32 _tmp4_ = 0U; |
3576 | - guint32 _tmp5_ = 0U; |
3577 | - gint _tmp6_ = 0; |
3578 | + gint _tmp5_ = 0; |
3579 | + guint32 _tmp6_ = 0U; |
3580 | + guint32 i = 0U; |
3581 | guint32 _tmp7_ = 0U; |
3582 | - guint32 i = 0U; |
3583 | - guint32 _tmp8_ = 0U; |
3584 | - GMappedFile* _tmp9_ = NULL; |
3585 | - gsize _tmp10_ = 0UL; |
3586 | - guint32 _tmp11_ = 0U; |
3587 | - gboolean _tmp12_ = FALSE; |
3588 | - _tmp1_ = _tmp0_; |
3589 | - if (!_tmp1_) { |
3590 | - gint _tmp2_ = 0; |
3591 | - _tmp2_ = k; |
3592 | - k = _tmp2_ + 1; |
3593 | + GMappedFile* _tmp8_ = NULL; |
3594 | + gsize _tmp9_ = 0UL; |
3595 | + guint32 _tmp10_ = 0U; |
3596 | + gboolean _tmp11_ = FALSE; |
3597 | + if (!_tmp0_) { |
3598 | + gint _tmp1_ = 0; |
3599 | + _tmp1_ = k; |
3600 | + k = _tmp1_ + 1; |
3601 | } |
3602 | _tmp0_ = FALSE; |
3603 | - _tmp3_ = k; |
3604 | - if (!(_tmp3_ < 4)) { |
3605 | + _tmp2_ = k; |
3606 | + if (!(_tmp2_ < 4)) { |
3607 | break; |
3608 | } |
3609 | - _tmp4_ = b0; |
3610 | - _tmp5_ = b1; |
3611 | - _tmp6_ = k; |
3612 | - _tmp7_ = kkc_murmur_hash3_32 (_tmp4_, _tmp5_, (guint32) _tmp6_); |
3613 | - h = _tmp7_; |
3614 | - _tmp8_ = h; |
3615 | - _tmp9_ = self->priv->mmap; |
3616 | - _tmp10_ = g_mapped_file_get_length (_tmp9_); |
3617 | - i = (guint32) (_tmp8_ * ((_tmp10_ * 8) / ((gdouble) 0xFFFFFFFFLL))); |
3618 | - _tmp11_ = i; |
3619 | - _tmp12_ = kkc_bloom_filter_is_bit_set (self, _tmp11_); |
3620 | - if (!_tmp12_) { |
3621 | + _tmp3_ = b0; |
3622 | + _tmp4_ = b1; |
3623 | + _tmp5_ = k; |
3624 | + _tmp6_ = kkc_murmur_hash3_32 (_tmp3_, _tmp4_, (guint32) _tmp5_); |
3625 | + h = _tmp6_; |
3626 | + _tmp7_ = h; |
3627 | + _tmp8_ = self->priv->mmap; |
3628 | + _tmp9_ = g_mapped_file_get_length (_tmp8_); |
3629 | + i = (guint32) (_tmp7_ * ((_tmp9_ * 8) / ((gdouble) 0xFFFFFFFFLL))); |
3630 | + _tmp10_ = i; |
3631 | + _tmp11_ = kkc_bloom_filter_is_bit_set (self, _tmp10_); |
3632 | + if (!_tmp11_) { |
3633 | result = FALSE; |
3634 | return result; |
3635 | } |
3636 | |
3637 | === modified file 'libkkc/bloom-filter.vala' |
3638 | --- libkkc/bloom-filter.vala 2014-02-26 22:51:39 +0000 |
3639 | +++ libkkc/bloom-filter.vala 2014-10-01 15:12:30 +0000 |
3640 | @@ -1,6 +1,6 @@ |
3641 | /* |
3642 | - * Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
3643 | - * Copyright (C) 2012-2013 Red Hat, Inc. |
3644 | + * Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
3645 | + * Copyright (C) 2012-2014 Red Hat, Inc. |
3646 | * |
3647 | * This program is free software: you can redistribute it and/or modify |
3648 | * it under the terms of the GNU General Public License as published by |
3649 | |
3650 | === modified file 'libkkc/candidate-list.c' |
3651 | --- libkkc/candidate-list.c 2014-06-15 23:27:57 +0000 |
3652 | +++ libkkc/candidate-list.c 2014-10-01 15:12:30 +0000 |
3653 | @@ -1,9 +1,9 @@ |
3654 | -/* candidate-list.c generated by valac 0.22.1, the Vala compiler |
3655 | +/* candidate-list.c generated by valac 0.24.0.131-42e78, the Vala compiler |
3656 | * generated from candidate-list.vala, do not modify */ |
3657 | |
3658 | /* |
3659 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
3660 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
3661 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
3662 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
3663 | * |
3664 | * This program is free software: you can redistribute it and/or modify |
3665 | * it under the terms of the GNU General Public License as published by |
3666 | @@ -134,10 +134,9 @@ |
3667 | gint _tmp0_ = 0; |
3668 | gboolean _tmp2_ = FALSE; |
3669 | gint _tmp3_ = 0; |
3670 | - gboolean _tmp7_ = FALSE; |
3671 | - GeeArrayList* _tmp8_ = NULL; |
3672 | - gint _tmp9_ = 0; |
3673 | - gpointer _tmp10_ = NULL; |
3674 | + GeeArrayList* _tmp7_ = NULL; |
3675 | + gint _tmp8_ = 0; |
3676 | + gpointer _tmp9_ = NULL; |
3677 | g_return_val_if_fail (self != NULL, NULL); |
3678 | _tmp0_ = index; |
3679 | if (_tmp0_ < 0) { |
3680 | @@ -157,12 +156,11 @@ |
3681 | } else { |
3682 | _tmp2_ = FALSE; |
3683 | } |
3684 | - _tmp7_ = _tmp2_; |
3685 | - _vala_assert (_tmp7_, "0 <= index && index < size"); |
3686 | - _tmp8_ = self->priv->_candidates; |
3687 | - _tmp9_ = index; |
3688 | - _tmp10_ = gee_abstract_list_get ((GeeAbstractList*) _tmp8_, _tmp9_); |
3689 | - result = (KkcCandidate*) _tmp10_; |
3690 | + _vala_assert (_tmp2_, "0 <= index && index < size"); |
3691 | + _tmp7_ = self->priv->_candidates; |
3692 | + _tmp8_ = index; |
3693 | + _tmp9_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, _tmp8_); |
3694 | + result = (KkcCandidate*) _tmp9_; |
3695 | return result; |
3696 | } |
3697 | |
3698 | @@ -337,7 +335,7 @@ |
3699 | gint _tmp3__length1 = 0; |
3700 | g_return_val_if_fail (self != NULL, NULL); |
3701 | _tmp0_ = self->priv->_candidates; |
3702 | - _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); |
3703 | + _tmp2_ = gee_collection_to_array ((GeeCollection*) _tmp0_, &_tmp1_); |
3704 | _tmp3_ = _tmp2_; |
3705 | _tmp3__length1 = _tmp1_; |
3706 | if (result_length1) { |
3707 | @@ -551,10 +549,9 @@ |
3708 | gboolean _tmp2_ = FALSE; |
3709 | gboolean _tmp3_ = FALSE; |
3710 | gboolean _tmp5_ = FALSE; |
3711 | - gboolean _tmp6_ = FALSE; |
3712 | g_return_val_if_fail (self != NULL, FALSE); |
3713 | _tmp1_ = self->priv->_candidates; |
3714 | - _tmp2_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp1_); |
3715 | + _tmp2_ = gee_collection_get_is_empty ((GeeCollection*) _tmp1_); |
3716 | _tmp3_ = _tmp2_; |
3717 | if (_tmp3_) { |
3718 | _tmp0_ = TRUE; |
3719 | @@ -563,30 +560,156 @@ |
3720 | _tmp4_ = step; |
3721 | _tmp0_ = _tmp4_ == 0; |
3722 | } |
3723 | - _tmp5_ = _tmp0_; |
3724 | - if (_tmp5_) { |
3725 | + if (_tmp0_) { |
3726 | result = FALSE; |
3727 | return result; |
3728 | } |
3729 | - _tmp6_ = self->priv->_round; |
3730 | - if (_tmp6_) { |
3731 | + _tmp5_ = self->priv->_round; |
3732 | + if (_tmp5_) { |
3733 | gint pos = 0; |
3734 | + gint _tmp6_ = 0; |
3735 | gint _tmp7_ = 0; |
3736 | + GeeArrayList* _tmp8_ = NULL; |
3737 | + gint _tmp9_ = 0; |
3738 | + gint _tmp10_ = 0; |
3739 | + gint _tmp11_ = 0; |
3740 | + gint _tmp16_ = 0; |
3741 | + _tmp6_ = self->priv->_cursor_pos; |
3742 | + _tmp7_ = step; |
3743 | + _tmp8_ = self->priv->_candidates; |
3744 | + _tmp9_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp8_); |
3745 | + _tmp10_ = _tmp9_; |
3746 | + pos = (_tmp6_ + _tmp7_) % _tmp10_; |
3747 | + _tmp11_ = pos; |
3748 | + if (_tmp11_ < 0) { |
3749 | + gint _tmp12_ = 0; |
3750 | + GeeArrayList* _tmp13_ = NULL; |
3751 | + gint _tmp14_ = 0; |
3752 | + gint _tmp15_ = 0; |
3753 | + _tmp12_ = pos; |
3754 | + _tmp13_ = self->priv->_candidates; |
3755 | + _tmp14_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp13_); |
3756 | + _tmp15_ = _tmp14_; |
3757 | + pos = _tmp12_ + _tmp15_; |
3758 | + } |
3759 | + _tmp16_ = pos; |
3760 | + self->priv->_cursor_pos = _tmp16_; |
3761 | + g_object_notify ((GObject*) self, "cursor-pos"); |
3762 | + result = TRUE; |
3763 | + return result; |
3764 | + } else { |
3765 | + gint pos = 0; |
3766 | + gint _tmp17_ = 0; |
3767 | + gint _tmp18_ = 0; |
3768 | + gboolean _tmp19_ = FALSE; |
3769 | + gint _tmp20_ = 0; |
3770 | + _tmp17_ = self->priv->_cursor_pos; |
3771 | + _tmp18_ = step; |
3772 | + pos = _tmp17_ + _tmp18_; |
3773 | + _tmp20_ = pos; |
3774 | + if (0 <= _tmp20_) { |
3775 | + gint _tmp21_ = 0; |
3776 | + GeeArrayList* _tmp22_ = NULL; |
3777 | + gint _tmp23_ = 0; |
3778 | + gint _tmp24_ = 0; |
3779 | + _tmp21_ = pos; |
3780 | + _tmp22_ = self->priv->_candidates; |
3781 | + _tmp23_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp22_); |
3782 | + _tmp24_ = _tmp23_; |
3783 | + _tmp19_ = _tmp21_ < _tmp24_; |
3784 | + } else { |
3785 | + _tmp19_ = FALSE; |
3786 | + } |
3787 | + if (_tmp19_) { |
3788 | + gint _tmp25_ = 0; |
3789 | + _tmp25_ = pos; |
3790 | + self->priv->_cursor_pos = _tmp25_; |
3791 | + g_object_notify ((GObject*) self, "cursor-pos"); |
3792 | + result = TRUE; |
3793 | + return result; |
3794 | + } |
3795 | + } |
3796 | + result = FALSE; |
3797 | + return result; |
3798 | +} |
3799 | + |
3800 | + |
3801 | +/** |
3802 | + * Move cursor to the previous candidate. |
3803 | + * |
3804 | + * @return `true` if cursor position has changed, `false` otherwise. |
3805 | + */ |
3806 | +gboolean kkc_candidate_list_cursor_up (KkcCandidateList* self) { |
3807 | + gboolean result = FALSE; |
3808 | + gboolean _tmp0_ = FALSE; |
3809 | + g_return_val_if_fail (self != NULL, FALSE); |
3810 | + _tmp0_ = kkc_candidate_list_cursor_move (self, -1); |
3811 | + result = _tmp0_; |
3812 | + return result; |
3813 | +} |
3814 | + |
3815 | + |
3816 | +/** |
3817 | + * Move cursor to the next candidate. |
3818 | + * |
3819 | + * @return `true` if cursor position has changed, `false` otherwise |
3820 | + */ |
3821 | +gboolean kkc_candidate_list_cursor_down (KkcCandidateList* self) { |
3822 | + gboolean result = FALSE; |
3823 | + gboolean _tmp0_ = FALSE; |
3824 | + g_return_val_if_fail (self != NULL, FALSE); |
3825 | + _tmp0_ = kkc_candidate_list_cursor_move (self, 1); |
3826 | + result = _tmp0_; |
3827 | + return result; |
3828 | +} |
3829 | + |
3830 | + |
3831 | +static gboolean kkc_candidate_list_page_move (KkcCandidateList* self, gint step) { |
3832 | + gboolean result = FALSE; |
3833 | + gboolean _tmp0_ = FALSE; |
3834 | + GeeArrayList* _tmp1_ = NULL; |
3835 | + gboolean _tmp2_ = FALSE; |
3836 | + gboolean _tmp3_ = FALSE; |
3837 | + gboolean _tmp5_ = FALSE; |
3838 | + g_return_val_if_fail (self != NULL, FALSE); |
3839 | + _tmp1_ = self->priv->_candidates; |
3840 | + _tmp2_ = gee_collection_get_is_empty ((GeeCollection*) _tmp1_); |
3841 | + _tmp3_ = _tmp2_; |
3842 | + if (_tmp3_) { |
3843 | + _tmp0_ = TRUE; |
3844 | + } else { |
3845 | + gint _tmp4_ = 0; |
3846 | + _tmp4_ = step; |
3847 | + _tmp0_ = _tmp4_ == 0; |
3848 | + } |
3849 | + if (_tmp0_) { |
3850 | + result = FALSE; |
3851 | + return result; |
3852 | + } |
3853 | + _tmp5_ = self->priv->_round; |
3854 | + if (_tmp5_) { |
3855 | + guint pos = 0U; |
3856 | + gint _tmp6_ = 0; |
3857 | + guint _tmp7_ = 0U; |
3858 | gint _tmp8_ = 0; |
3859 | GeeArrayList* _tmp9_ = NULL; |
3860 | gint _tmp10_ = 0; |
3861 | gint _tmp11_ = 0; |
3862 | - gint _tmp12_ = 0; |
3863 | - gint _tmp17_ = 0; |
3864 | - _tmp7_ = self->priv->_cursor_pos; |
3865 | + guint _tmp12_ = 0U; |
3866 | + guint _tmp17_ = 0U; |
3867 | + guint _tmp18_ = 0U; |
3868 | + guint _tmp19_ = 0U; |
3869 | + gint _tmp20_ = 0; |
3870 | + _tmp6_ = self->priv->_cursor_pos; |
3871 | + _tmp7_ = self->priv->_page_size; |
3872 | _tmp8_ = step; |
3873 | _tmp9_ = self->priv->_candidates; |
3874 | _tmp10_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp9_); |
3875 | _tmp11_ = _tmp10_; |
3876 | - pos = (_tmp7_ + _tmp8_) % _tmp11_; |
3877 | + pos = (_tmp6_ + (_tmp7_ * _tmp8_)) % _tmp11_; |
3878 | _tmp12_ = pos; |
3879 | - if (_tmp12_ < 0) { |
3880 | - gint _tmp13_ = 0; |
3881 | + if (_tmp12_ < ((guint) 0)) { |
3882 | + guint _tmp13_ = 0U; |
3883 | GeeArrayList* _tmp14_ = NULL; |
3884 | gint _tmp15_ = 0; |
3885 | gint _tmp16_ = 0; |
3886 | @@ -597,190 +720,57 @@ |
3887 | pos = _tmp13_ + _tmp16_; |
3888 | } |
3889 | _tmp17_ = pos; |
3890 | - self->priv->_cursor_pos = _tmp17_; |
3891 | - g_object_notify ((GObject*) self, "cursor-pos"); |
3892 | - result = TRUE; |
3893 | - return result; |
3894 | + _tmp18_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp17_); |
3895 | + pos = _tmp18_; |
3896 | + _tmp19_ = pos; |
3897 | + _tmp20_ = self->priv->_cursor_pos; |
3898 | + if (_tmp19_ != ((guint) _tmp20_)) { |
3899 | + guint _tmp21_ = 0U; |
3900 | + _tmp21_ = pos; |
3901 | + self->priv->_cursor_pos = (gint) _tmp21_; |
3902 | + g_object_notify ((GObject*) self, "cursor-pos"); |
3903 | + result = TRUE; |
3904 | + return result; |
3905 | + } |
3906 | } else { |
3907 | - gint pos = 0; |
3908 | - gint _tmp18_ = 0; |
3909 | - gint _tmp19_ = 0; |
3910 | - gboolean _tmp20_ = FALSE; |
3911 | - gint _tmp21_ = 0; |
3912 | - gboolean _tmp26_ = FALSE; |
3913 | - _tmp18_ = self->priv->_cursor_pos; |
3914 | - _tmp19_ = step; |
3915 | - pos = _tmp18_ + _tmp19_; |
3916 | - _tmp21_ = pos; |
3917 | - if (0 <= _tmp21_) { |
3918 | - gint _tmp22_ = 0; |
3919 | - GeeArrayList* _tmp23_ = NULL; |
3920 | - gint _tmp24_ = 0; |
3921 | - gint _tmp25_ = 0; |
3922 | - _tmp22_ = pos; |
3923 | - _tmp23_ = self->priv->_candidates; |
3924 | - _tmp24_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp23_); |
3925 | - _tmp25_ = _tmp24_; |
3926 | - _tmp20_ = _tmp22_ < _tmp25_; |
3927 | - } else { |
3928 | - _tmp20_ = FALSE; |
3929 | - } |
3930 | - _tmp26_ = _tmp20_; |
3931 | - if (_tmp26_) { |
3932 | - gint _tmp27_ = 0; |
3933 | + guint pos = 0U; |
3934 | + gint _tmp22_ = 0; |
3935 | + guint _tmp23_ = 0U; |
3936 | + gint _tmp24_ = 0; |
3937 | + gboolean _tmp25_ = FALSE; |
3938 | + guint _tmp26_ = 0U; |
3939 | + _tmp22_ = self->priv->_cursor_pos; |
3940 | + _tmp23_ = self->priv->_page_size; |
3941 | + _tmp24_ = step; |
3942 | + pos = _tmp22_ + (_tmp23_ * _tmp24_); |
3943 | + _tmp26_ = pos; |
3944 | + if (((guint) 0) <= _tmp26_) { |
3945 | + guint _tmp27_ = 0U; |
3946 | + GeeArrayList* _tmp28_ = NULL; |
3947 | + gint _tmp29_ = 0; |
3948 | + gint _tmp30_ = 0; |
3949 | _tmp27_ = pos; |
3950 | - self->priv->_cursor_pos = _tmp27_; |
3951 | - g_object_notify ((GObject*) self, "cursor-pos"); |
3952 | - result = TRUE; |
3953 | - return result; |
3954 | - } |
3955 | - } |
3956 | - result = FALSE; |
3957 | - return result; |
3958 | -} |
3959 | - |
3960 | - |
3961 | -/** |
3962 | - * Move cursor to the previous candidate. |
3963 | - * |
3964 | - * @return `true` if cursor position has changed, `false` otherwise. |
3965 | - */ |
3966 | -gboolean kkc_candidate_list_cursor_up (KkcCandidateList* self) { |
3967 | - gboolean result = FALSE; |
3968 | - gboolean _tmp0_ = FALSE; |
3969 | - g_return_val_if_fail (self != NULL, FALSE); |
3970 | - _tmp0_ = kkc_candidate_list_cursor_move (self, -1); |
3971 | - result = _tmp0_; |
3972 | - return result; |
3973 | -} |
3974 | - |
3975 | - |
3976 | -/** |
3977 | - * Move cursor to the next candidate. |
3978 | - * |
3979 | - * @return `true` if cursor position has changed, `false` otherwise |
3980 | - */ |
3981 | -gboolean kkc_candidate_list_cursor_down (KkcCandidateList* self) { |
3982 | - gboolean result = FALSE; |
3983 | - gboolean _tmp0_ = FALSE; |
3984 | - g_return_val_if_fail (self != NULL, FALSE); |
3985 | - _tmp0_ = kkc_candidate_list_cursor_move (self, 1); |
3986 | - result = _tmp0_; |
3987 | - return result; |
3988 | -} |
3989 | - |
3990 | - |
3991 | -static gboolean kkc_candidate_list_page_move (KkcCandidateList* self, gint step) { |
3992 | - gboolean result = FALSE; |
3993 | - gboolean _tmp0_ = FALSE; |
3994 | - GeeArrayList* _tmp1_ = NULL; |
3995 | - gboolean _tmp2_ = FALSE; |
3996 | - gboolean _tmp3_ = FALSE; |
3997 | - gboolean _tmp5_ = FALSE; |
3998 | - gboolean _tmp6_ = FALSE; |
3999 | - g_return_val_if_fail (self != NULL, FALSE); |
4000 | - _tmp1_ = self->priv->_candidates; |
4001 | - _tmp2_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp1_); |
4002 | - _tmp3_ = _tmp2_; |
4003 | - if (_tmp3_) { |
4004 | - _tmp0_ = TRUE; |
4005 | - } else { |
4006 | - gint _tmp4_ = 0; |
4007 | - _tmp4_ = step; |
4008 | - _tmp0_ = _tmp4_ == 0; |
4009 | - } |
4010 | - _tmp5_ = _tmp0_; |
4011 | - if (_tmp5_) { |
4012 | - result = FALSE; |
4013 | - return result; |
4014 | - } |
4015 | - _tmp6_ = self->priv->_round; |
4016 | - if (_tmp6_) { |
4017 | - guint pos = 0U; |
4018 | - gint _tmp7_ = 0; |
4019 | - guint _tmp8_ = 0U; |
4020 | - gint _tmp9_ = 0; |
4021 | - GeeArrayList* _tmp10_ = NULL; |
4022 | - gint _tmp11_ = 0; |
4023 | - gint _tmp12_ = 0; |
4024 | - guint _tmp13_ = 0U; |
4025 | - guint _tmp18_ = 0U; |
4026 | - guint _tmp19_ = 0U; |
4027 | - guint _tmp20_ = 0U; |
4028 | - gint _tmp21_ = 0; |
4029 | - _tmp7_ = self->priv->_cursor_pos; |
4030 | - _tmp8_ = self->priv->_page_size; |
4031 | - _tmp9_ = step; |
4032 | - _tmp10_ = self->priv->_candidates; |
4033 | - _tmp11_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp10_); |
4034 | - _tmp12_ = _tmp11_; |
4035 | - pos = (_tmp7_ + (_tmp8_ * _tmp9_)) % _tmp12_; |
4036 | - _tmp13_ = pos; |
4037 | - if (_tmp13_ < ((guint) 0)) { |
4038 | - guint _tmp14_ = 0U; |
4039 | - GeeArrayList* _tmp15_ = NULL; |
4040 | - gint _tmp16_ = 0; |
4041 | - gint _tmp17_ = 0; |
4042 | - _tmp14_ = pos; |
4043 | - _tmp15_ = self->priv->_candidates; |
4044 | - _tmp16_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp15_); |
4045 | - _tmp17_ = _tmp16_; |
4046 | - pos = _tmp14_ + _tmp17_; |
4047 | - } |
4048 | - _tmp18_ = pos; |
4049 | - _tmp19_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp18_); |
4050 | - pos = _tmp19_; |
4051 | - _tmp20_ = pos; |
4052 | - _tmp21_ = self->priv->_cursor_pos; |
4053 | - if (_tmp20_ != ((guint) _tmp21_)) { |
4054 | - guint _tmp22_ = 0U; |
4055 | - _tmp22_ = pos; |
4056 | - self->priv->_cursor_pos = (gint) _tmp22_; |
4057 | - g_object_notify ((GObject*) self, "cursor-pos"); |
4058 | - result = TRUE; |
4059 | - return result; |
4060 | - } |
4061 | - } else { |
4062 | - guint pos = 0U; |
4063 | - gint _tmp23_ = 0; |
4064 | - guint _tmp24_ = 0U; |
4065 | - gint _tmp25_ = 0; |
4066 | - gboolean _tmp26_ = FALSE; |
4067 | - guint _tmp27_ = 0U; |
4068 | - gboolean _tmp32_ = FALSE; |
4069 | - _tmp23_ = self->priv->_cursor_pos; |
4070 | - _tmp24_ = self->priv->_page_size; |
4071 | - _tmp25_ = step; |
4072 | - pos = _tmp23_ + (_tmp24_ * _tmp25_); |
4073 | - _tmp27_ = pos; |
4074 | - if (((guint) 0) <= _tmp27_) { |
4075 | - guint _tmp28_ = 0U; |
4076 | - GeeArrayList* _tmp29_ = NULL; |
4077 | - gint _tmp30_ = 0; |
4078 | - gint _tmp31_ = 0; |
4079 | - _tmp28_ = pos; |
4080 | - _tmp29_ = self->priv->_candidates; |
4081 | - _tmp30_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp29_); |
4082 | - _tmp31_ = _tmp30_; |
4083 | - _tmp26_ = _tmp28_ < ((guint) _tmp31_); |
4084 | + _tmp28_ = self->priv->_candidates; |
4085 | + _tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp28_); |
4086 | + _tmp30_ = _tmp29_; |
4087 | + _tmp25_ = _tmp27_ < ((guint) _tmp30_); |
4088 | } else { |
4089 | - _tmp26_ = FALSE; |
4090 | + _tmp25_ = FALSE; |
4091 | } |
4092 | - _tmp32_ = _tmp26_; |
4093 | - if (_tmp32_) { |
4094 | + if (_tmp25_) { |
4095 | + guint _tmp31_ = 0U; |
4096 | + guint _tmp32_ = 0U; |
4097 | guint _tmp33_ = 0U; |
4098 | - guint _tmp34_ = 0U; |
4099 | - guint _tmp35_ = 0U; |
4100 | - gint _tmp36_ = 0; |
4101 | + gint _tmp34_ = 0; |
4102 | + _tmp31_ = pos; |
4103 | + _tmp32_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp31_); |
4104 | + pos = _tmp32_; |
4105 | _tmp33_ = pos; |
4106 | - _tmp34_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp33_); |
4107 | - pos = _tmp34_; |
4108 | - _tmp35_ = pos; |
4109 | - _tmp36_ = self->priv->_cursor_pos; |
4110 | - if (_tmp35_ != ((guint) _tmp36_)) { |
4111 | - guint _tmp37_ = 0U; |
4112 | - _tmp37_ = pos; |
4113 | - self->priv->_cursor_pos = (gint) _tmp37_; |
4114 | + _tmp34_ = self->priv->_cursor_pos; |
4115 | + if (_tmp33_ != ((guint) _tmp34_)) { |
4116 | + guint _tmp35_ = 0U; |
4117 | + _tmp35_ = pos; |
4118 | + self->priv->_cursor_pos = (gint) _tmp35_; |
4119 | g_object_notify ((GObject*) self, "cursor-pos"); |
4120 | result = TRUE; |
4121 | return result; |
4122 | @@ -927,8 +917,8 @@ |
4123 | static void kkc_candidate_list_class_init (KkcCandidateListClass * klass) { |
4124 | kkc_candidate_list_parent_class = g_type_class_peek_parent (klass); |
4125 | g_type_class_add_private (klass, sizeof (KkcCandidateListPrivate)); |
4126 | - KKC_CANDIDATE_LIST_CLASS (klass)->next = kkc_candidate_list_real_next; |
4127 | - KKC_CANDIDATE_LIST_CLASS (klass)->previous = kkc_candidate_list_real_previous; |
4128 | + ((KkcCandidateListClass *) klass)->next = kkc_candidate_list_real_next; |
4129 | + ((KkcCandidateListClass *) klass)->previous = kkc_candidate_list_real_previous; |
4130 | G_OBJECT_CLASS (klass)->get_property = _vala_kkc_candidate_list_get_property; |
4131 | G_OBJECT_CLASS (klass)->set_property = _vala_kkc_candidate_list_set_property; |
4132 | G_OBJECT_CLASS (klass)->finalize = kkc_candidate_list_finalize; |
4133 | @@ -973,9 +963,9 @@ |
4134 | GeeArrayList* _tmp0_ = NULL; |
4135 | GeeHashSet* _tmp1_ = NULL; |
4136 | self->priv = KKC_CANDIDATE_LIST_GET_PRIVATE (self); |
4137 | - _tmp0_ = gee_array_list_new (KKC_TYPE_CANDIDATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); |
4138 | + _tmp0_ = gee_array_list_new (KKC_TYPE_CANDIDATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); |
4139 | self->priv->_candidates = _tmp0_; |
4140 | - _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); |
4141 | + _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); |
4142 | self->priv->seen = (GeeSet*) _tmp1_; |
4143 | } |
4144 | |
4145 | |
4146 | === modified file 'libkkc/candidate-list.vala' |
4147 | --- libkkc/candidate-list.vala 2014-02-26 22:51:39 +0000 |
4148 | +++ libkkc/candidate-list.vala 2014-10-01 15:12:30 +0000 |
4149 | @@ -1,6 +1,6 @@ |
4150 | /* |
4151 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4152 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4153 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4154 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4155 | * |
4156 | * This program is free software: you can redistribute it and/or modify |
4157 | * it under the terms of the GNU General Public License as published by |
4158 | @@ -63,7 +63,7 @@ |
4159 | } |
4160 | } |
4161 | |
4162 | - Set<string> seen = new HashSet<string> (); |
4163 | + Set<string> seen = new Gee.HashSet<string> (); |
4164 | |
4165 | internal void clear () { |
4166 | bool is_populated = false; |
4167 | |
4168 | === modified file 'libkkc/candidate.c' |
4169 | --- libkkc/candidate.c 2014-06-15 23:27:57 +0000 |
4170 | +++ libkkc/candidate.c 2014-10-01 15:12:30 +0000 |
4171 | @@ -1,9 +1,9 @@ |
4172 | -/* candidate.c generated by valac 0.22.1, the Vala compiler |
4173 | +/* candidate.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4174 | * generated from candidate.vala, do not modify */ |
4175 | |
4176 | /* |
4177 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4178 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4179 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4180 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4181 | * |
4182 | * This program is free software: you can redistribute it and/or modify |
4183 | * it under the terms of the GNU General Public License as published by |
4184 | @@ -140,7 +140,6 @@ |
4185 | const gchar* _tmp3_ = NULL; |
4186 | const gchar* _tmp4_ = NULL; |
4187 | const gchar* _tmp5_ = NULL; |
4188 | - const gchar* _tmp8_ = NULL; |
4189 | g_return_val_if_fail (midasi != NULL, NULL); |
4190 | g_return_val_if_fail (text != NULL, NULL); |
4191 | self = (KkcCandidate*) g_object_new (object_type, NULL); |
4192 | @@ -162,8 +161,7 @@ |
4193 | _tmp7_ = output; |
4194 | _tmp4_ = _tmp7_; |
4195 | } |
4196 | - _tmp8_ = _tmp4_; |
4197 | - kkc_candidate_set_output (self, _tmp8_); |
4198 | + kkc_candidate_set_output (self, _tmp4_); |
4199 | return self; |
4200 | } |
4201 | |
4202 | |
4203 | === modified file 'libkkc/candidate.vala' |
4204 | --- libkkc/candidate.vala 2014-02-26 22:51:39 +0000 |
4205 | +++ libkkc/candidate.vala 2014-10-01 15:12:30 +0000 |
4206 | @@ -1,6 +1,6 @@ |
4207 | /* |
4208 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4209 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4210 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4211 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4212 | * |
4213 | * This program is free software: you can redistribute it and/or modify |
4214 | * it under the terms of the GNU General Public License as published by |
4215 | |
4216 | === modified file 'libkkc/context.c' |
4217 | --- libkkc/context.c 2014-06-15 23:27:57 +0000 |
4218 | +++ libkkc/context.c 2014-10-01 15:12:30 +0000 |
4219 | @@ -1,9 +1,9 @@ |
4220 | -/* context.c generated by valac 0.22.1, the Vala compiler |
4221 | +/* context.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4222 | * generated from context.vala, do not modify */ |
4223 | |
4224 | /* |
4225 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4226 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4227 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4228 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4229 | * |
4230 | * This program is free software: you can redistribute it and/or modify |
4231 | * it under the terms of the GNU General Public License as published by |
4232 | @@ -472,17 +472,17 @@ |
4233 | |
4234 | |
4235 | static void _kkc_context_notify_input_mode_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { |
4236 | - kkc_context_notify_input_mode_cb (self, _sender, pspec); |
4237 | + kkc_context_notify_input_mode_cb ((KkcContext*) self, _sender, pspec); |
4238 | } |
4239 | |
4240 | |
4241 | static void _kkc_context_request_selection_text_cb_kkc_state_request_selection_text (KkcState* _sender, gpointer self) { |
4242 | - kkc_context_request_selection_text_cb (self); |
4243 | + kkc_context_request_selection_text_cb ((KkcContext*) self); |
4244 | } |
4245 | |
4246 | |
4247 | static void _kkc_context_candidates_selected_cb_kkc_candidate_list_selected (KkcCandidateList* _sender, KkcCandidate* candidate, gpointer self) { |
4248 | - kkc_context_candidates_selected_cb (self); |
4249 | + kkc_context_candidates_selected_cb ((KkcContext*) self); |
4250 | } |
4251 | |
4252 | |
4253 | @@ -620,7 +620,7 @@ |
4254 | GError * _inner_error_ = NULL; |
4255 | g_return_val_if_fail (self != NULL, FALSE); |
4256 | g_return_val_if_fail (keyseq != NULL, FALSE); |
4257 | - _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL); |
4258 | + _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL); |
4259 | keys = (GeeList*) _tmp0_; |
4260 | _tmp1_ = g_string_new (""); |
4261 | builder = _tmp1_; |
4262 | @@ -827,7 +827,6 @@ |
4263 | gboolean _tmp60_ = FALSE; |
4264 | KkcKeyEvent* _tmp61_ = NULL; |
4265 | gboolean _tmp62_ = FALSE; |
4266 | - gboolean _tmp64_ = FALSE; |
4267 | _tmp44_ = _key_index; |
4268 | _key_index = _tmp44_ + 1; |
4269 | _tmp45_ = _key_index; |
4270 | @@ -876,7 +875,7 @@ |
4271 | _tmp58_ = key; |
4272 | _tmp59_ = kkc_key_event_new_from_string (_tmp58_, &_inner_error_); |
4273 | ev = _tmp59_; |
4274 | - if (_inner_error_ != NULL) { |
4275 | + if (G_UNLIKELY (_inner_error_ != NULL)) { |
4276 | if (_inner_error_->domain == KKC_KEY_EVENT_FORMAT_ERROR) { |
4277 | g_propagate_error (error, _inner_error_); |
4278 | _g_free0 (key); |
4279 | @@ -903,8 +902,7 @@ |
4280 | } else { |
4281 | _tmp60_ = FALSE; |
4282 | } |
4283 | - _tmp64_ = _tmp60_; |
4284 | - if (_tmp64_) { |
4285 | + if (_tmp60_) { |
4286 | retval = TRUE; |
4287 | } |
4288 | _g_object_unref0 (ev); |
4289 | @@ -1320,7 +1318,7 @@ |
4290 | |
4291 | |
4292 | static void _kkc_context_filter_forwarded_cb_kkc_key_event_filter_forwarded (KkcKeyEventFilter* _sender, KkcKeyEvent* key, gpointer self) { |
4293 | - kkc_context_filter_forwarded_cb (self, key); |
4294 | + kkc_context_filter_forwarded_cb ((KkcContext*) self, key); |
4295 | } |
4296 | |
4297 | |
4298 | @@ -1439,7 +1437,7 @@ |
4299 | static void kkc_context_instance_init (KkcContext * self) { |
4300 | GeeHashMap* _tmp0_ = NULL; |
4301 | self->priv = KKC_CONTEXT_GET_PRIVATE (self); |
4302 | - _tmp0_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, KKC_TYPE_STATE_HANDLER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); |
4303 | + _tmp0_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, KKC_TYPE_STATE_HANDLER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); |
4304 | self->priv->handlers = (GeeMap*) _tmp0_; |
4305 | } |
4306 | |
4307 | |
4308 | === modified file 'libkkc/context.vala' |
4309 | --- libkkc/context.vala 2014-02-26 22:51:39 +0000 |
4310 | +++ libkkc/context.vala 2014-10-01 15:12:30 +0000 |
4311 | @@ -1,6 +1,6 @@ |
4312 | /* |
4313 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4314 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4315 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4316 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4317 | * |
4318 | * This program is free software: you can redistribute it and/or modify |
4319 | * it under the terms of the GNU General Public License as published by |
4320 | |
4321 | === modified file 'libkkc/convert-segment-state-handler.c' |
4322 | --- libkkc/convert-segment-state-handler.c 2014-06-15 23:27:57 +0000 |
4323 | +++ libkkc/convert-segment-state-handler.c 2014-10-01 15:12:30 +0000 |
4324 | @@ -1,9 +1,9 @@ |
4325 | -/* convert-segment-state-handler.c generated by valac 0.22.1, the Vala compiler |
4326 | +/* convert-segment-state-handler.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4327 | * generated from convert-segment-state-handler.vala, do not modify */ |
4328 | |
4329 | /* |
4330 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4331 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4332 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4333 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4334 | * |
4335 | * This program is free software: you can redistribute it and/or modify |
4336 | * it under the terms of the GNU General Public License as published by |
4337 | @@ -409,35 +409,35 @@ |
4338 | |
4339 | static gboolean _kkc_convert_segment_state_handler_do_next_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4340 | gboolean result; |
4341 | - result = kkc_convert_segment_state_handler_do_next_candidate (self, command, state, key); |
4342 | + result = kkc_convert_segment_state_handler_do_next_candidate ((KkcConvertSegmentStateHandler*) self, command, state, key); |
4343 | return result; |
4344 | } |
4345 | |
4346 | |
4347 | static gboolean _kkc_convert_segment_state_handler_do_previous_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4348 | gboolean result; |
4349 | - result = kkc_convert_segment_state_handler_do_previous_candidate (self, command, state, key); |
4350 | + result = kkc_convert_segment_state_handler_do_previous_candidate ((KkcConvertSegmentStateHandler*) self, command, state, key); |
4351 | return result; |
4352 | } |
4353 | |
4354 | |
4355 | static gboolean _kkc_convert_segment_state_handler_do_purge_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4356 | gboolean result; |
4357 | - result = kkc_convert_segment_state_handler_do_purge_candidate (self, command, state, key); |
4358 | + result = kkc_convert_segment_state_handler_do_purge_candidate ((KkcConvertSegmentStateHandler*) self, command, state, key); |
4359 | return result; |
4360 | } |
4361 | |
4362 | |
4363 | static gboolean _kkc_convert_segment_state_handler_do_clear_unhandled_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4364 | gboolean result; |
4365 | - result = kkc_convert_segment_state_handler_do_clear_unhandled (self, command, state, key); |
4366 | + result = kkc_convert_segment_state_handler_do_clear_unhandled ((KkcConvertSegmentStateHandler*) self, command, state, key); |
4367 | return result; |
4368 | } |
4369 | |
4370 | |
4371 | static gboolean _kkc_convert_segment_state_handler_do_select_unhandled_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4372 | gboolean result; |
4373 | - result = kkc_convert_segment_state_handler_do_select_unhandled (self, command, state, key); |
4374 | + result = kkc_convert_segment_state_handler_do_select_unhandled ((KkcConvertSegmentStateHandler*) self, command, state, key); |
4375 | return result; |
4376 | } |
4377 | |
4378 | @@ -487,46 +487,44 @@ |
4379 | gboolean _tmp3_ = FALSE; |
4380 | _tmp3_ = TRUE; |
4381 | while (TRUE) { |
4382 | - gboolean _tmp4_ = FALSE; |
4383 | - gint _tmp6_ = 0; |
4384 | - GEnumClass* _tmp7_ = NULL; |
4385 | - gint _tmp8_ = 0; |
4386 | + gint _tmp5_ = 0; |
4387 | + GEnumClass* _tmp6_ = NULL; |
4388 | + gint _tmp7_ = 0; |
4389 | GEnumValue* enum_value = NULL; |
4390 | - GEnumClass* _tmp9_ = NULL; |
4391 | - gint _tmp10_ = 0; |
4392 | + GEnumClass* _tmp8_ = NULL; |
4393 | + gint _tmp9_ = 0; |
4394 | + GEnumValue* _tmp10_ = NULL; |
4395 | GEnumValue* _tmp11_ = NULL; |
4396 | GEnumValue* _tmp12_ = NULL; |
4397 | - GEnumValue* _tmp13_ = NULL; |
4398 | - _tmp4_ = _tmp3_; |
4399 | - if (!_tmp4_) { |
4400 | - gint _tmp5_ = 0; |
4401 | - _tmp5_ = i; |
4402 | - i = _tmp5_ + 1; |
4403 | + if (!_tmp3_) { |
4404 | + gint _tmp4_ = 0; |
4405 | + _tmp4_ = i; |
4406 | + i = _tmp4_ + 1; |
4407 | } |
4408 | _tmp3_ = FALSE; |
4409 | - _tmp6_ = i; |
4410 | - _tmp7_ = enum_class; |
4411 | - _tmp8_ = _tmp7_->maximum; |
4412 | - if (!(_tmp6_ <= _tmp8_)) { |
4413 | + _tmp5_ = i; |
4414 | + _tmp6_ = enum_class; |
4415 | + _tmp7_ = _tmp6_->maximum; |
4416 | + if (!(_tmp5_ <= _tmp7_)) { |
4417 | break; |
4418 | } |
4419 | - _tmp9_ = enum_class; |
4420 | - _tmp10_ = i; |
4421 | - _tmp11_ = g_enum_get_value (_tmp9_, _tmp10_); |
4422 | - _tmp12_ = __g_enum_value_dup0 (_tmp11_); |
4423 | - enum_value = _tmp12_; |
4424 | - _tmp13_ = enum_value; |
4425 | - if (_tmp13_ != NULL) { |
4426 | - GEnumValue* _tmp14_ = NULL; |
4427 | - const gchar* _tmp15_ = NULL; |
4428 | + _tmp8_ = enum_class; |
4429 | + _tmp9_ = i; |
4430 | + _tmp10_ = g_enum_get_value (_tmp8_, _tmp9_); |
4431 | + _tmp11_ = __g_enum_value_dup0 (_tmp10_); |
4432 | + enum_value = _tmp11_; |
4433 | + _tmp12_ = enum_value; |
4434 | + if (_tmp12_ != NULL) { |
4435 | + GEnumValue* _tmp13_ = NULL; |
4436 | + const gchar* _tmp14_ = NULL; |
4437 | + gchar* _tmp15_ = NULL; |
4438 | gchar* _tmp16_ = NULL; |
4439 | - gchar* _tmp17_ = NULL; |
4440 | - _tmp14_ = enum_value; |
4441 | - _tmp15_ = (*_tmp14_).value_nick; |
4442 | - _tmp16_ = g_strconcat ("convert-", _tmp15_, NULL); |
4443 | - _tmp17_ = _tmp16_; |
4444 | - kkc_state_handler_register_command_callback ((KkcStateHandler*) self, _tmp17_, _kkc_convert_segment_state_handler_do_clear_unhandled_kkc_command_callback, self); |
4445 | - _g_free0 (_tmp17_); |
4446 | + _tmp13_ = enum_value; |
4447 | + _tmp14_ = (*_tmp13_).value_nick; |
4448 | + _tmp15_ = g_strconcat ("convert-", _tmp14_, NULL); |
4449 | + _tmp16_ = _tmp15_; |
4450 | + kkc_state_handler_register_command_callback ((KkcStateHandler*) self, _tmp16_, _kkc_convert_segment_state_handler_do_clear_unhandled_kkc_command_callback, self); |
4451 | + _g_free0 (_tmp16_); |
4452 | } |
4453 | _g_free0 (enum_value); |
4454 | } |
4455 | @@ -540,7 +538,7 @@ |
4456 | |
4457 | static void kkc_convert_segment_state_handler_class_init (KkcConvertSegmentStateHandlerClass * klass) { |
4458 | kkc_convert_segment_state_handler_parent_class = g_type_class_peek_parent (klass); |
4459 | - KKC_STATE_HANDLER_CLASS (klass)->process_key_event = kkc_convert_segment_state_handler_real_process_key_event; |
4460 | + ((KkcStateHandlerClass *) klass)->process_key_event = kkc_convert_segment_state_handler_real_process_key_event; |
4461 | G_OBJECT_CLASS (klass)->constructor = kkc_convert_segment_state_handler_constructor; |
4462 | } |
4463 | |
4464 | |
4465 | === modified file 'libkkc/convert-segment-state-handler.vala' |
4466 | --- libkkc/convert-segment-state-handler.vala 2014-06-15 23:27:57 +0000 |
4467 | +++ libkkc/convert-segment-state-handler.vala 2014-10-01 15:12:30 +0000 |
4468 | @@ -1,6 +1,6 @@ |
4469 | /* |
4470 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4471 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4472 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4473 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4474 | * |
4475 | * This program is free software: you can redistribute it and/or modify |
4476 | * it under the terms of the GNU General Public License as published by |
4477 | |
4478 | === modified file 'libkkc/convert-sentence-state-handler.c' |
4479 | --- libkkc/convert-sentence-state-handler.c 2014-06-15 23:27:57 +0000 |
4480 | +++ libkkc/convert-sentence-state-handler.c 2014-10-01 15:12:30 +0000 |
4481 | @@ -1,9 +1,9 @@ |
4482 | -/* convert-sentence-state-handler.c generated by valac 0.22.1, the Vala compiler |
4483 | +/* convert-sentence-state-handler.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4484 | * generated from convert-sentence-state-handler.vala, do not modify */ |
4485 | |
4486 | /* |
4487 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4488 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4489 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4490 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4491 | * |
4492 | * This program is free software: you can redistribute it and/or modify |
4493 | * it under the terms of the GNU General Public License as published by |
4494 | @@ -599,10 +599,8 @@ |
4495 | KkcState* _tmp7_ = NULL; |
4496 | gboolean _tmp8_ = FALSE; |
4497 | const gchar* _tmp9_ = NULL; |
4498 | - gboolean _tmp16_ = FALSE; |
4499 | - gboolean _tmp17_ = FALSE; |
4500 | - const gchar* _tmp18_ = NULL; |
4501 | - gboolean _tmp27_ = FALSE; |
4502 | + gboolean _tmp15_ = FALSE; |
4503 | + const gchar* _tmp16_ = NULL; |
4504 | g_return_val_if_fail (self != NULL, FALSE); |
4505 | g_return_val_if_fail (state != NULL, FALSE); |
4506 | g_return_val_if_fail (key != NULL, FALSE); |
4507 | @@ -624,7 +622,6 @@ |
4508 | } else { |
4509 | gboolean _tmp10_ = FALSE; |
4510 | const gchar* _tmp11_ = NULL; |
4511 | - gboolean _tmp15_ = FALSE; |
4512 | _tmp11_ = command; |
4513 | if (_tmp11_ == NULL) { |
4514 | KkcKeyEvent* _tmp12_ = NULL; |
4515 | @@ -637,42 +634,37 @@ |
4516 | } else { |
4517 | _tmp10_ = FALSE; |
4518 | } |
4519 | - _tmp15_ = _tmp10_; |
4520 | - _tmp8_ = _tmp15_; |
4521 | + _tmp8_ = _tmp10_; |
4522 | } |
4523 | - _tmp16_ = _tmp8_; |
4524 | - if (_tmp16_) { |
4525 | + if (_tmp8_) { |
4526 | result = TRUE; |
4527 | return result; |
4528 | } |
4529 | - _tmp18_ = command; |
4530 | - if (_tmp18_ == NULL) { |
4531 | - gboolean _tmp19_ = FALSE; |
4532 | - KkcKeyEvent* _tmp20_ = NULL; |
4533 | - KkcModifierType _tmp21_ = 0; |
4534 | - KkcModifierType _tmp22_ = 0; |
4535 | - gboolean _tmp26_ = FALSE; |
4536 | - _tmp20_ = key; |
4537 | - _tmp21_ = kkc_key_event_get_modifiers (_tmp20_); |
4538 | - _tmp22_ = _tmp21_; |
4539 | - if (_tmp22_ == 0) { |
4540 | - _tmp19_ = TRUE; |
4541 | + _tmp16_ = command; |
4542 | + if (_tmp16_ == NULL) { |
4543 | + gboolean _tmp17_ = FALSE; |
4544 | + KkcKeyEvent* _tmp18_ = NULL; |
4545 | + KkcModifierType _tmp19_ = 0; |
4546 | + KkcModifierType _tmp20_ = 0; |
4547 | + _tmp18_ = key; |
4548 | + _tmp19_ = kkc_key_event_get_modifiers (_tmp18_); |
4549 | + _tmp20_ = _tmp19_; |
4550 | + if (_tmp20_ == 0) { |
4551 | + _tmp17_ = TRUE; |
4552 | } else { |
4553 | - KkcKeyEvent* _tmp23_ = NULL; |
4554 | - KkcModifierType _tmp24_ = 0; |
4555 | - KkcModifierType _tmp25_ = 0; |
4556 | - _tmp23_ = key; |
4557 | - _tmp24_ = kkc_key_event_get_modifiers (_tmp23_); |
4558 | - _tmp25_ = _tmp24_; |
4559 | - _tmp19_ = _tmp25_ == KKC_MODIFIER_TYPE_SHIFT_MASK; |
4560 | + KkcKeyEvent* _tmp21_ = NULL; |
4561 | + KkcModifierType _tmp22_ = 0; |
4562 | + KkcModifierType _tmp23_ = 0; |
4563 | + _tmp21_ = key; |
4564 | + _tmp22_ = kkc_key_event_get_modifiers (_tmp21_); |
4565 | + _tmp23_ = _tmp22_; |
4566 | + _tmp17_ = _tmp23_ == KKC_MODIFIER_TYPE_SHIFT_MASK; |
4567 | } |
4568 | - _tmp26_ = _tmp19_; |
4569 | - _tmp17_ = _tmp26_; |
4570 | + _tmp15_ = _tmp17_; |
4571 | } else { |
4572 | - _tmp17_ = FALSE; |
4573 | + _tmp15_ = FALSE; |
4574 | } |
4575 | - _tmp27_ = _tmp17_; |
4576 | - if (_tmp27_) { |
4577 | + if (_tmp15_) { |
4578 | result = FALSE; |
4579 | return result; |
4580 | } |
4581 | @@ -712,63 +704,63 @@ |
4582 | |
4583 | static gboolean _kkc_convert_sentence_state_handler_do_start_segment_conversion_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4584 | gboolean result; |
4585 | - result = kkc_convert_sentence_state_handler_do_start_segment_conversion (self, command, state, key); |
4586 | + result = kkc_convert_sentence_state_handler_do_start_segment_conversion ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4587 | return result; |
4588 | } |
4589 | |
4590 | |
4591 | static gboolean _kkc_convert_sentence_state_handler_do_original_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4592 | gboolean result; |
4593 | - result = kkc_convert_sentence_state_handler_do_original_candidate (self, command, state, key); |
4594 | + result = kkc_convert_sentence_state_handler_do_original_candidate ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4595 | return result; |
4596 | } |
4597 | |
4598 | |
4599 | static gboolean _kkc_convert_sentence_state_handler_do_expand_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4600 | gboolean result; |
4601 | - result = kkc_convert_sentence_state_handler_do_expand_segment (self, command, state, key); |
4602 | + result = kkc_convert_sentence_state_handler_do_expand_segment ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4603 | return result; |
4604 | } |
4605 | |
4606 | |
4607 | static gboolean _kkc_convert_sentence_state_handler_do_shrink_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4608 | gboolean result; |
4609 | - result = kkc_convert_sentence_state_handler_do_shrink_segment (self, command, state, key); |
4610 | + result = kkc_convert_sentence_state_handler_do_shrink_segment ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4611 | return result; |
4612 | } |
4613 | |
4614 | |
4615 | static gboolean _kkc_convert_sentence_state_handler_do_next_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4616 | gboolean result; |
4617 | - result = kkc_convert_sentence_state_handler_do_next_segment (self, command, state, key); |
4618 | + result = kkc_convert_sentence_state_handler_do_next_segment ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4619 | return result; |
4620 | } |
4621 | |
4622 | |
4623 | static gboolean _kkc_convert_sentence_state_handler_do_previous_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4624 | gboolean result; |
4625 | - result = kkc_convert_sentence_state_handler_do_previous_segment (self, command, state, key); |
4626 | + result = kkc_convert_sentence_state_handler_do_previous_segment ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4627 | return result; |
4628 | } |
4629 | |
4630 | |
4631 | static gboolean _kkc_convert_sentence_state_handler_do_first_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4632 | gboolean result; |
4633 | - result = kkc_convert_sentence_state_handler_do_first_segment (self, command, state, key); |
4634 | + result = kkc_convert_sentence_state_handler_do_first_segment ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4635 | return result; |
4636 | } |
4637 | |
4638 | |
4639 | static gboolean _kkc_convert_sentence_state_handler_do_last_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4640 | gboolean result; |
4641 | - result = kkc_convert_sentence_state_handler_do_last_segment (self, command, state, key); |
4642 | + result = kkc_convert_sentence_state_handler_do_last_segment ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4643 | return result; |
4644 | } |
4645 | |
4646 | |
4647 | static gboolean _kkc_convert_sentence_state_handler_do_clear_unhandled_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4648 | gboolean result; |
4649 | - result = kkc_convert_sentence_state_handler_do_clear_unhandled (self, command, state, key); |
4650 | + result = kkc_convert_sentence_state_handler_do_clear_unhandled ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4651 | return result; |
4652 | } |
4653 | |
4654 | @@ -788,7 +780,7 @@ |
4655 | |
4656 | static gboolean _kkc_convert_sentence_state_handler_do__kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) { |
4657 | gboolean result; |
4658 | - result = kkc_convert_sentence_state_handler_do_ (self, command, state, key); |
4659 | + result = kkc_convert_sentence_state_handler_do_ ((KkcConvertSentenceStateHandler*) self, command, state, key); |
4660 | return result; |
4661 | } |
4662 | |
4663 | @@ -827,55 +819,53 @@ |
4664 | gboolean _tmp3_ = FALSE; |
4665 | _tmp3_ = TRUE; |
4666 | while (TRUE) { |
4667 | - gboolean _tmp4_ = FALSE; |
4668 | - gint _tmp6_ = 0; |
4669 | - GEnumClass* _tmp7_ = NULL; |
4670 | - gint _tmp8_ = 0; |
4671 | + gint _tmp5_ = 0; |
4672 | + GEnumClass* _tmp6_ = NULL; |
4673 | + gint _tmp7_ = 0; |
4674 | GEnumValue* enum_value = NULL; |
4675 | - GEnumClass* _tmp9_ = NULL; |
4676 | - gint _tmp10_ = 0; |
4677 | + GEnumClass* _tmp8_ = NULL; |
4678 | + gint _tmp9_ = 0; |
4679 | + GEnumValue* _tmp10_ = NULL; |
4680 | GEnumValue* _tmp11_ = NULL; |
4681 | GEnumValue* _tmp12_ = NULL; |
4682 | - GEnumValue* _tmp13_ = NULL; |
4683 | - _tmp4_ = _tmp3_; |
4684 | - if (!_tmp4_) { |
4685 | - gint _tmp5_ = 0; |
4686 | - _tmp5_ = i; |
4687 | - i = _tmp5_ + 1; |
4688 | + if (!_tmp3_) { |
4689 | + gint _tmp4_ = 0; |
4690 | + _tmp4_ = i; |
4691 | + i = _tmp4_ + 1; |
4692 | } |
4693 | _tmp3_ = FALSE; |
4694 | - _tmp6_ = i; |
4695 | - _tmp7_ = enum_class; |
4696 | - _tmp8_ = _tmp7_->maximum; |
4697 | - if (!(_tmp6_ <= _tmp8_)) { |
4698 | + _tmp5_ = i; |
4699 | + _tmp6_ = enum_class; |
4700 | + _tmp7_ = _tmp6_->maximum; |
4701 | + if (!(_tmp5_ <= _tmp7_)) { |
4702 | break; |
4703 | } |
4704 | - _tmp9_ = enum_class; |
4705 | - _tmp10_ = i; |
4706 | - _tmp11_ = g_enum_get_value (_tmp9_, _tmp10_); |
4707 | - _tmp12_ = __g_enum_value_dup0 (_tmp11_); |
4708 | - enum_value = _tmp12_; |
4709 | - _tmp13_ = enum_value; |
4710 | - if (_tmp13_ != NULL) { |
4711 | - GEnumValue* _tmp14_ = NULL; |
4712 | - const gchar* _tmp15_ = NULL; |
4713 | + _tmp8_ = enum_class; |
4714 | + _tmp9_ = i; |
4715 | + _tmp10_ = g_enum_get_value (_tmp8_, _tmp9_); |
4716 | + _tmp11_ = __g_enum_value_dup0 (_tmp10_); |
4717 | + enum_value = _tmp11_; |
4718 | + _tmp12_ = enum_value; |
4719 | + if (_tmp12_ != NULL) { |
4720 | + GEnumValue* _tmp13_ = NULL; |
4721 | + const gchar* _tmp14_ = NULL; |
4722 | + gchar* _tmp15_ = NULL; |
4723 | gchar* _tmp16_ = NULL; |
4724 | - gchar* _tmp17_ = NULL; |
4725 | - GEnumValue* _tmp18_ = NULL; |
4726 | - gint _tmp19_ = 0; |
4727 | + GEnumValue* _tmp17_ = NULL; |
4728 | + gint _tmp18_ = 0; |
4729 | + KkcConvertSentenceStateHandlerConvertCommandHandler* _tmp19_ = NULL; |
4730 | KkcConvertSentenceStateHandlerConvertCommandHandler* _tmp20_ = NULL; |
4731 | - KkcConvertSentenceStateHandlerConvertCommandHandler* _tmp21_ = NULL; |
4732 | - _tmp14_ = enum_value; |
4733 | - _tmp15_ = (*_tmp14_).value_nick; |
4734 | - _tmp16_ = g_strconcat ("convert-", _tmp15_, NULL); |
4735 | - _tmp17_ = _tmp16_; |
4736 | - _tmp18_ = enum_value; |
4737 | - _tmp19_ = (*_tmp18_).value; |
4738 | - _tmp20_ = kkc_convert_sentence_state_handler_convert_command_handler_new ((KkcKanaMode) _tmp19_); |
4739 | - _tmp21_ = _tmp20_; |
4740 | - kkc_state_handler_register_command_handler ((KkcStateHandler*) self, _tmp17_, (KkcCommandHandler*) _tmp21_); |
4741 | - _g_object_unref0 (_tmp21_); |
4742 | - _g_free0 (_tmp17_); |
4743 | + _tmp13_ = enum_value; |
4744 | + _tmp14_ = (*_tmp13_).value_nick; |
4745 | + _tmp15_ = g_strconcat ("convert-", _tmp14_, NULL); |
4746 | + _tmp16_ = _tmp15_; |
4747 | + _tmp17_ = enum_value; |
4748 | + _tmp18_ = (*_tmp17_).value; |
4749 | + _tmp19_ = kkc_convert_sentence_state_handler_convert_command_handler_new ((KkcKanaMode) _tmp18_); |
4750 | + _tmp20_ = _tmp19_; |
4751 | + kkc_state_handler_register_command_handler ((KkcStateHandler*) self, _tmp16_, (KkcCommandHandler*) _tmp20_); |
4752 | + _g_object_unref0 (_tmp20_); |
4753 | + _g_free0 (_tmp16_); |
4754 | } |
4755 | _g_free0 (enum_value); |
4756 | } |
4757 | @@ -959,7 +949,7 @@ |
4758 | |
4759 | static void kkc_convert_sentence_state_handler_class_init (KkcConvertSentenceStateHandlerClass * klass) { |
4760 | kkc_convert_sentence_state_handler_parent_class = g_type_class_peek_parent (klass); |
4761 | - KKC_STATE_HANDLER_CLASS (klass)->process_key_event = kkc_convert_sentence_state_handler_real_process_key_event; |
4762 | + ((KkcStateHandlerClass *) klass)->process_key_event = kkc_convert_sentence_state_handler_real_process_key_event; |
4763 | G_OBJECT_CLASS (klass)->constructor = kkc_convert_sentence_state_handler_constructor; |
4764 | } |
4765 | |
4766 | |
4767 | === modified file 'libkkc/convert-sentence-state-handler.vala' |
4768 | --- libkkc/convert-sentence-state-handler.vala 2014-06-15 23:27:57 +0000 |
4769 | +++ libkkc/convert-sentence-state-handler.vala 2014-10-01 15:12:30 +0000 |
4770 | @@ -1,6 +1,6 @@ |
4771 | /* |
4772 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4773 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4774 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4775 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4776 | * |
4777 | * This program is free software: you can redistribute it and/or modify |
4778 | * it under the terms of the GNU General Public License as published by |
4779 | |
4780 | === modified file 'libkkc/decoder.c' |
4781 | --- libkkc/decoder.c 2014-06-15 23:27:57 +0000 |
4782 | +++ libkkc/decoder.c 2014-10-01 15:12:30 +0000 |
4783 | @@ -1,9 +1,9 @@ |
4784 | -/* decoder.c generated by valac 0.22.1, the Vala compiler |
4785 | +/* decoder.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4786 | * generated from decoder.vala, do not modify */ |
4787 | |
4788 | /* |
4789 | - * Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
4790 | - * Copyright (C) 2012-2013 Red Hat, Inc. |
4791 | + * Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
4792 | + * Copyright (C) 2012-2014 Red Hat, Inc. |
4793 | * |
4794 | * This program is free software: you can redistribute it and/or modify |
4795 | * it under the terms of the GNU General Public License as published by |
4796 | @@ -234,8 +234,8 @@ |
4797 | |
4798 | static void kkc_decoder_class_init (KkcDecoderClass * klass) { |
4799 | kkc_decoder_parent_class = g_type_class_peek_parent (klass); |
4800 | - KKC_DECODER_CLASS (klass)->decode = kkc_decoder_real_decode; |
4801 | - KKC_DECODER_CLASS (klass)->decode_with_costs = kkc_decoder_real_decode_with_costs; |
4802 | + ((KkcDecoderClass *) klass)->decode = kkc_decoder_real_decode; |
4803 | + ((KkcDecoderClass *) klass)->decode_with_costs = kkc_decoder_real_decode_with_costs; |
4804 | } |
4805 | |
4806 | |
4807 | |
4808 | === modified file 'libkkc/decoder.vala' |
4809 | --- libkkc/decoder.vala 2014-02-26 22:51:39 +0000 |
4810 | +++ libkkc/decoder.vala 2014-10-01 15:12:30 +0000 |
4811 | @@ -1,6 +1,6 @@ |
4812 | /* |
4813 | - * Copyright (C) 2012-2013 Daiki Ueno <ueno@gnu.org> |
4814 | - * Copyright (C) 2012-2013 Red Hat, Inc. |
4815 | + * Copyright (C) 2012-2014 Daiki Ueno <ueno@gnu.org> |
4816 | + * Copyright (C) 2012-2014 Red Hat, Inc. |
4817 | * |
4818 | * This program is free software: you can redistribute it and/or modify |
4819 | * it under the terms of the GNU General Public License as published by |
4820 | |
4821 | === modified file 'libkkc/dictionary-list.c' |
4822 | --- libkkc/dictionary-list.c 2014-06-15 23:27:57 +0000 |
4823 | +++ libkkc/dictionary-list.c 2014-10-01 15:12:30 +0000 |
4824 | @@ -1,9 +1,9 @@ |
4825 | -/* dictionary-list.c generated by valac 0.22.1, the Vala compiler |
4826 | +/* dictionary-list.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4827 | * generated from dictionary-list.vala, do not modify */ |
4828 | |
4829 | /* |
4830 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4831 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4832 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4833 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4834 | * |
4835 | * This program is free software: you can redistribute it and/or modify |
4836 | * it under the terms of the GNU General Public License as published by |
4837 | @@ -88,9 +88,9 @@ |
4838 | void kkc_dictionary_list_clear (KkcDictionaryList* self); |
4839 | void kkc_dictionary_list_call (KkcDictionaryList* self, GType* type, KkcDictionaryListDictionaryCallback callback, void* callback_target); |
4840 | void kkc_dictionary_list_save (KkcDictionaryList* self); |
4841 | -static KkcDictionaryCallbackReturn __lambda7_ (KkcDictionaryList* self, KkcDictionary* dictionary); |
4842 | +static KkcDictionaryCallbackReturn __lambda9_ (KkcDictionaryList* self, KkcDictionary* dictionary); |
4843 | void kkc_dictionary_save (KkcDictionary* self, GError** error); |
4844 | -static KkcDictionaryCallbackReturn ___lambda7__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self); |
4845 | +static KkcDictionaryCallbackReturn ___lambda9__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self); |
4846 | KkcDictionaryList* kkc_dictionary_list_new (void); |
4847 | KkcDictionaryList* kkc_dictionary_list_construct (GType object_type); |
4848 | gint kkc_dictionary_list_get_size (KkcDictionaryList* self); |
4849 | @@ -197,8 +197,6 @@ |
4850 | gboolean _tmp11_ = FALSE; |
4851 | gboolean _tmp12_ = FALSE; |
4852 | GType* _tmp13_ = NULL; |
4853 | - gboolean _tmp18_ = FALSE; |
4854 | - gboolean _tmp22_ = FALSE; |
4855 | _tmp5_ = _dictionary_index; |
4856 | _dictionary_index = _tmp5_ + 1; |
4857 | _tmp6_ = _dictionary_index; |
4858 | @@ -224,22 +222,20 @@ |
4859 | _tmp17_ = g_type_is_a (_tmp15_, *_tmp16_); |
4860 | _tmp12_ = _tmp17_; |
4861 | } |
4862 | - _tmp18_ = _tmp12_; |
4863 | - if (_tmp18_) { |
4864 | - KkcDictionaryListDictionaryCallback _tmp19_ = NULL; |
4865 | - void* _tmp19__target = NULL; |
4866 | - KkcDictionary* _tmp20_ = NULL; |
4867 | - KkcDictionaryCallbackReturn _tmp21_ = 0; |
4868 | - _tmp19_ = callback; |
4869 | - _tmp19__target = callback_target; |
4870 | - _tmp20_ = dictionary; |
4871 | - _tmp21_ = _tmp19_ (_tmp20_, _tmp19__target); |
4872 | - _tmp11_ = _tmp21_ == KKC_DICTIONARY_CALLBACK_RETURN_REMOVE; |
4873 | + if (_tmp12_) { |
4874 | + KkcDictionaryListDictionaryCallback _tmp18_ = NULL; |
4875 | + void* _tmp18__target = NULL; |
4876 | + KkcDictionary* _tmp19_ = NULL; |
4877 | + KkcDictionaryCallbackReturn _tmp20_ = 0; |
4878 | + _tmp18_ = callback; |
4879 | + _tmp18__target = callback_target; |
4880 | + _tmp19_ = dictionary; |
4881 | + _tmp20_ = _tmp18_ (_tmp19_, _tmp18__target); |
4882 | + _tmp11_ = _tmp20_ == KKC_DICTIONARY_CALLBACK_RETURN_REMOVE; |
4883 | } else { |
4884 | _tmp11_ = FALSE; |
4885 | } |
4886 | - _tmp22_ = _tmp11_; |
4887 | - if (_tmp22_) { |
4888 | + if (_tmp11_) { |
4889 | _g_object_unref0 (dictionary); |
4890 | _g_object_unref0 (_dictionary_list); |
4891 | return; |
4892 | @@ -254,7 +250,7 @@ |
4893 | /** |
4894 | * Save dictionaries on to disk. |
4895 | */ |
4896 | -static KkcDictionaryCallbackReturn __lambda7_ (KkcDictionaryList* self, KkcDictionary* dictionary) { |
4897 | +static KkcDictionaryCallbackReturn __lambda9_ (KkcDictionaryList* self, KkcDictionary* dictionary) { |
4898 | KkcDictionaryCallbackReturn result = 0; |
4899 | GError * _inner_error_ = NULL; |
4900 | g_return_val_if_fail (dictionary != NULL, 0); |
4901 | @@ -262,7 +258,7 @@ |
4902 | KkcDictionary* _tmp0_ = NULL; |
4903 | _tmp0_ = dictionary; |
4904 | kkc_dictionary_save (_tmp0_, &_inner_error_); |
4905 | - if (_inner_error_ != NULL) { |
4906 | + if (G_UNLIKELY (_inner_error_ != NULL)) { |
4907 | goto __catch19_g_error; |
4908 | } |
4909 | } |
4910 | @@ -280,7 +276,7 @@ |
4911 | _g_error_free0 (e); |
4912 | } |
4913 | __finally19: |
4914 | - if (_inner_error_ != NULL) { |
4915 | + if (G_UNLIKELY (_inner_error_ != NULL)) { |
4916 | g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); |
4917 | g_clear_error (&_inner_error_); |
4918 | return 0; |
4919 | @@ -290,16 +286,16 @@ |
4920 | } |
4921 | |
4922 | |
4923 | -static KkcDictionaryCallbackReturn ___lambda7__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self) { |
4924 | +static KkcDictionaryCallbackReturn ___lambda9__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self) { |
4925 | KkcDictionaryCallbackReturn result; |
4926 | - result = __lambda7_ (self, dictionary); |
4927 | + result = __lambda9_ ((KkcDictionaryList*) self, dictionary); |
4928 | return result; |
4929 | } |
4930 | |
4931 | |
4932 | void kkc_dictionary_list_save (KkcDictionaryList* self) { |
4933 | g_return_if_fail (self != NULL); |
4934 | - kkc_dictionary_list_call (self, NULL, ___lambda7__kkc_dictionary_list_dictionary_callback, self); |
4935 | + kkc_dictionary_list_call (self, NULL, ___lambda9__kkc_dictionary_list_dictionary_callback, self); |
4936 | } |
4937 | |
4938 | |
4939 | @@ -344,7 +340,7 @@ |
4940 | static void kkc_dictionary_list_instance_init (KkcDictionaryList * self) { |
4941 | GeeArrayList* _tmp0_ = NULL; |
4942 | self->priv = KKC_DICTIONARY_LIST_GET_PRIVATE (self); |
4943 | - _tmp0_ = gee_array_list_new (KKC_TYPE_DICTIONARY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); |
4944 | + _tmp0_ = gee_array_list_new (KKC_TYPE_DICTIONARY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); |
4945 | self->priv->dictionaries = (GeeList*) _tmp0_; |
4946 | } |
4947 | |
4948 | |
4949 | === modified file 'libkkc/dictionary-list.vala' |
4950 | --- libkkc/dictionary-list.vala 2014-02-26 22:51:39 +0000 |
4951 | +++ libkkc/dictionary-list.vala 2014-10-01 15:12:30 +0000 |
4952 | @@ -1,6 +1,6 @@ |
4953 | /* |
4954 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4955 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4956 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4957 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4958 | * |
4959 | * This program is free software: you can redistribute it and/or modify |
4960 | * it under the terms of the GNU General Public License as published by |
4961 | |
4962 | === modified file 'libkkc/dictionary.c' |
4963 | --- libkkc/dictionary.c 2014-06-15 23:27:57 +0000 |
4964 | +++ libkkc/dictionary.c 2014-10-01 15:12:30 +0000 |
4965 | @@ -1,9 +1,9 @@ |
4966 | -/* dictionary.c generated by valac 0.22.1, the Vala compiler |
4967 | +/* dictionary.c generated by valac 0.24.0.131-42e78, the Vala compiler |
4968 | * generated from dictionary.vala, do not modify */ |
4969 | |
4970 | /* |
4971 | - * Copyright (C) 2011-2013 Daiki Ueno <ueno@gnu.org> |
4972 | - * Copyright (C) 2011-2013 Red Hat, Inc. |
4973 | + * Copyright (C) 2011-2014 Daiki Ueno <ueno@gnu.org> |
4974 | + * Copyright (C) 2011-2014 Red Hat, Inc. |
4975 | * |
4976 | * This program is free software: you can redistribute it and/or modify |
4977 | * it under the terms of the GNU General Public License as published by |
4978 | @@ -143,15 +143,13 @@ |
4979 | gboolean _tmp8_ = FALSE; |
4980 | glong _tmp9_ = 0L; |
4981 | gboolean _tmp12_ = FALSE; |
4982 | - gboolean _tmp13_ = FALSE; |
4983 | - glong _tmp14_ = 0L; |
4984 | - gboolean _tmp17_ = FALSE; |
4985 | + glong _tmp13_ = 0L; |
4986 | + glong _tmp16_ = 0L; |
4987 | + glong _tmp17_ = 0L; |
4988 | glong _tmp18_ = 0L; |
4989 | glong _tmp19_ = 0L; |
4990 | glong _tmp20_ = 0L; |
4991 | - glong _tmp21_ = 0L; |
4992 | - glong _tmp22_ = 0L; |
4993 | - gchar* _tmp23_ = NULL; |
4994 | + gchar* _tmp21_ = NULL; |
4995 | g_return_val_if_fail (self != NULL, NULL); |
4996 | _tmp0_ = strlen (self); |
4997 | _tmp1_ = _tmp0_; |
4998 | @@ -182,28 +180,26 @@ |
4999 | } else { |
5000 | _tmp8_ = FALSE; |
The diff has been truncated for viewing.
Already archived new package in debian. Does not need to merge, just sync.