Changeset 7606 for lang/vim

Timestamp:

03/07/08 09:26:07 (9 months ago)

Author:

mattn

Message:

lang/vim/misc/NabeAtzz.vim:
おもいっきり間違ってたので直した。

Files:

• lang/vim/misc/NabeAtzz.vim (modified) (2 diffs)

lang/vim/misc/NabeAtzz.vim

@@ -1 +1 @@
 scriptencoding utf-8
+
+silent! unlet s:ndg
+let s:ndg = [
+  \ {0: ''},
+  \ {0: 'じゅう'},
+  \ {0: 'ひゃく', 3: 'ぴゃく', 6: 'ぴゃく', 8: 'ぴゃく'},
+  \ {0: 'せん', 3: 'ぜん'},
+\ ]
 
 silent! unlet s:dig
 let s:dig = [
   \ {0: ''},
-  \ {0: 'じゅう'},
-  \ {0: 'ひゃく', 3: 'ぴゃく', 6: 'ぴゃく', 8: 'ぴゃく'},
-  \ {0: 'せん', 3: 'ぜん'},
   \ {0: 'まん'},
   \ {0: 'おく'},
@@ -43 +48 @@
 function! s:num2ja(num)
   let str = "" . a:num
- let len = len(str)
-  if len > 21
-    len = 21
+  let len = len(str)
+  if str == 0
+    return s:num[0][0]
+  endif
+  if len >= 17*4+1
+    return s:dig[17][0]
   endif
   let n = 0
   let ret = ""
   while n < len
-    if str[n] != 0 && ((len-n) == 1 || str[n] != 1)
+    if str[n] != 0 && (str[n] != 1 || (len-n)%4 == 1)
       let ret .= has_key(s:num[str[n]], len-n) ?
         \ s:num[str[n]][len-n] : s:num[str[n]][0]
     endif
     if str[n] != 0
-      let ret .= has_key(s:dig[len-n-1], str[n]) ?
-        \ s:dig[len-n-1][str[n]] : s:dig[len-n-1][0]
+      let ret .= has_key(s:ndg[(len-n-1)%4], str[n]) ?
+        \ s:ndg[(len-n-1)%4][str[n]] : s:ndg[(len-n-1)%4][0]
+      let ret .= has_key(s:dig[(len-n-1)/4], str[n]) ?
+        \ s:dig[(len-n-1)/4][str[n]] : s:dig[(len-n-1)/4][0]
     endif
+        "echo ret
     let n = n + 1
   endwhile