pyrite-dev/sj4
12
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Format

Browse source
This commit is contained in:
Nishi 2026-06-19 01:49:53 +09:00
commit 73cb09624a
116 changed files with 19741 additions and 21522 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.clang-format Normal file
View file

@ -0,0 +1,24 @@
---
UseTab: Always
TabWidth: 8
AlignConsecutiveAssignments:
Enabled: true
AlignConsecutiveDeclarations:
Enabled: true
AccessModifierOffset: -4
NamespaceIndentation: All
IndentWidth: 8
PointerAlignment: Left
ColumnLimit: 0
AllowShortIfStatementsOnASingleLine: Always
AllowShortBlocksOnASingleLine: Never
AllowShortFunctionsOnASingleLine: Empty
AllowShortLoopsOnASingleLine: true
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: true
SpaceBeforeParens: Never
AlignEscapedNewlines: DontAlign
SortIncludes: false
AllowShortEnumsOnASingleLine: false
#IndentPPDirectives: AfterHash

2
format.sh Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
clang-format --verbose -i `find src lib include -name "*.c" -or -name "*.h"`

4
include/sj3common/Const.h
View file

@ -92,8 +92,8 @@
#define ERROR -1 #define ERROR -1
#ifndef FALSE #ifndef FALSE
# define TRUE -1 #define TRUE -1
# define FALSE (!TRUE) #define FALSE (!TRUE)
#endif #endif
#endif /* CONST_H */ #endif /* CONST_H */

8
include/sj3common/sj3cmd.h
View file

@ -33,16 +33,8 @@
* $SonyDate: 1994/06/03 08:00:57 $ * $SonyDate: 1994/06/03 08:00:57 $
*/ */
#define SJ3SERV_VERSION_NO 2 #define SJ3SERV_VERSION_NO 2
#define SJ3_CONNECT 1 #define SJ3_CONNECT 1
#define SJ3_DISCONNECT 2 #define SJ3_DISCONNECT 2

4
include/sj3common/sj3err.h
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:00:58 $ * $SonyDate: 1994/06/03 08:00:58 $
*/ */
#define SJ3_InternalError -1 #define SJ3_InternalError -1
#define SJ3_NormalEnd 0 #define SJ3_NormalEnd 0

4
include/sj3common/sj_const.h
View file

@ -105,7 +105,6 @@
#define EUC_a4 (u_char)0xa4 #define EUC_a4 (u_char)0xa4
#define EUC_a5 (u_char)0xa5 #define EUC_a5 (u_char)0xa5
#define EUC_START (u_char)0xa1 #define EUC_START (u_char)0xa1
#define EUC_END (u_char)0xfe #define EUC_END (u_char)0xfe
#define EUC_END_KIGOU (u_char)0xae #define EUC_END_KIGOU (u_char)0xae
@ -149,7 +148,6 @@
#define SETTOU_KIGOU 4 #define SETTOU_KIGOU 4
#define NUMKETALENGTH 16 #define NUMKETALENGTH 16
#define NUMWORDBUF ((NUMKETALENGTH+3)/4) #define NUMWORDBUF ((NUMKETALENGTH + 3) / 4)
#endif #endif

13
include/sj3common/sj_hinsi.h
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:01:07 $ * $SonyDate: 1994/06/03 08:01:07 $
*/ */
#ifndef _SJ_HINSHI #ifndef _SJ_HINSHI
#define _SJ_HINSHI #define _SJ_HINSHI
@ -95,7 +91,6 @@
#define FUKUSI_9 53 #define FUKUSI_9 53
#define JOSUUSI2 54 #define JOSUUSI2 54
#define KEIYOUSI_1 60 #define KEIYOUSI_1 60
#define KEIYOUSI_2 61 #define KEIYOUSI_2 61
#define KEIYOUSI_3 62 #define KEIYOUSI_3 62
@ -120,7 +115,6 @@
#define DO_SAHEN 80 #define DO_SAHEN 80
#define DO_ZAHEN 81 #define DO_ZAHEN 81
#define DO_1DAN_1 90 #define DO_1DAN_1 90
#define DO_KAGO_1 91 #define DO_KAGO_1 91
#define DO_GAGO_1 92 #define DO_GAGO_1 92
@ -142,7 +136,6 @@
#define DO_RAGO_2 107 #define DO_RAGO_2 107
#define DO_WAGO_2 108 #define DO_WAGO_2 108
#define DO_KAGO_5 111 #define DO_KAGO_5 111
#define DO_GAGO_5 112 #define DO_GAGO_5 112
#define DO_SAGO_5 113 #define DO_SAGO_5 113
@ -152,7 +145,6 @@
#define DO_RAGO_5 117 #define DO_RAGO_5 117
#define DO_WAGO_5 118 #define DO_WAGO_5 118
#define DO_KAGO_6 121 #define DO_KAGO_6 121
#define DO_GAGO_6 122 #define DO_GAGO_6 122
#define DO_SAGO_6 123 #define DO_SAGO_6 123
@ -162,7 +154,6 @@
#define DO_RAGO_6 127 #define DO_RAGO_6 127
#define DO_WAGO_6 128 #define DO_WAGO_6 128
#define DO_1DAN_3 130 #define DO_1DAN_3 130
#define DO_KAGO_3 131 #define DO_KAGO_3 131
#define DO_GAGO_3 132 #define DO_GAGO_3 132
@ -173,7 +164,6 @@
#define DO_RAGO_3 137 #define DO_RAGO_3 137
#define DO_WAGO_3 138 #define DO_WAGO_3 138
#define DO_1DAN_4 140 #define DO_1DAN_4 140
#define DO_KAGO_4 141 #define DO_KAGO_4 141
#define DO_GAGO_4 142 #define DO_GAGO_4 142
@ -184,7 +174,6 @@
#define DO_RAGO_4 147 #define DO_RAGO_4 147
#define DO_WAGO_4 148 #define DO_WAGO_4 148
#define DO_KAGO_7 151 #define DO_KAGO_7 151
#define DO_GAGO_7 152 #define DO_GAGO_7 152
#define DO_SAGO_7 153 #define DO_SAGO_7 153
@ -194,7 +183,6 @@
#define DO_RAGO_7 157 #define DO_RAGO_7 157
#define DO_WAGO_7 158 #define DO_WAGO_7 158
#define DO_KAGO_8 161 #define DO_KAGO_8 161
#define DO_GAGO_8 162 #define DO_GAGO_8 162
#define DO_SAGO_8 163 #define DO_SAGO_8 163
@ -204,7 +192,6 @@
#define DO_RAGO_8 167 #define DO_RAGO_8 167
#define DO_WAGO_8 168 #define DO_WAGO_8 168
#define SP_SA_MI1 171 #define SP_SA_MI1 171
#define SP_SA_MI2 172 #define SP_SA_MI2 172
#define SP_SA_YOU 173 #define SP_SA_YOU 173

18
include/sj3common/sj_string.h
View file

@ -18,16 +18,16 @@
#define SJ_STRING_H #define SJ_STRING_H
/* string.c */ /* string.c */
int sj3_str_sjistoeuc(unsigned char *, int, unsigned char *, unsigned char *, int *); int sj3_str_sjistoeuc(unsigned char*, int, unsigned char*, unsigned char*, int*);
int sj3_str_euctosjis(unsigned char *, int, unsigned char *, unsigned char *, int *); int sj3_str_euctosjis(unsigned char*, int, unsigned char*, unsigned char*, int*);
int sj3_sjistoeuclen(unsigned char *, int); int sj3_sjistoeuclen(unsigned char*, int);
int sj3_sjistoeuc(unsigned char *s, int, unsigned char *, int); int sj3_sjistoeuc(unsigned char* s, int, unsigned char*, int);
int sj3_euctosjis(unsigned char *s, int, unsigned char *, int); int sj3_euctosjis(unsigned char* s, int, unsigned char*, int);
void sj_euc2sjis(unsigned char *); void sj_euc2sjis(unsigned char*);
void sj_jis2sjis(unsigned char *); void sj_jis2sjis(unsigned char*);
void sj_sjis2euc(unsigned char *); void sj_sjis2euc(unsigned char*);
void sj_sjis2jis(unsigned char *); void sj_sjis2jis(unsigned char*);
unsigned short sj3_jis2sjis(unsigned short); unsigned short sj3_jis2sjis(unsigned short);
unsigned short sj3_jis2euc(unsigned short); unsigned short sj3_jis2euc(unsigned short);
unsigned short sj3_sjis2jis(unsigned short); unsigned short sj3_sjis2jis(unsigned short);

11
include/sj3core/Dict.h
View file

@ -33,15 +33,11 @@
* $SonyDate: 1994/06/03 08:00:55 $ * $SonyDate: 1994/06/03 08:00:55 $
*/ */
#define VERSIONPOS 0 #define VERSIONPOS 0
#define PASSWDPOS 16 #define PASSWDPOS 16
#define PASSWDLEN 16 #define PASSWDLEN 16
#define STDYNORMPOS 32 #define STDYNORMPOS 32
#define STDYNORMLEN 36 #define STDYNORMLEN 36
#define STDYNORMNUM 40 #define STDYNORMNUM 40
@ -54,7 +50,6 @@
#define STDYCLSEGPOS 64 #define STDYCLSEGPOS 64
#define STDYCLSEGLEN 68 #define STDYCLSEGLEN 68
#define DICTIDXPOS 32 #define DICTIDXPOS 32
#define DICTIDXLEN 36 #define DICTIDXLEN 36
@ -69,14 +64,12 @@
#define DICTASEGPOS 80 #define DICTASEGPOS 80
#define DICTASEGLEN 84 #define DICTASEGLEN 84
#define HEADERPOS 0 #define HEADERPOS 0
#define HEADERLENGTH 128 #define HEADERLENGTH 128
#define COMMENTPOS 128 #define COMMENTPOS 128
#define COMMENTLENGTH 128 #define COMMENTLENGTH 128
#define Byte2Long(c3, c2, c1, c0) (((c3) << (8 * 3)) | ((c2) << (8 * 2)) | \
#define Byte2Long(c3,c2,c1,c0) (((c3) << (8*3)) | ((c2) << (8*2)) | \ ((c1) << (8 * 1)) | ((c0) << (8 * 0)))
((c1) << (8*1)) | ((c0) << (8*0)))
#define STDYVERSION Byte2Long('S', 2, 0, 0) #define STDYVERSION Byte2Long('S', 2, 0, 0)
#define DICTVERSION Byte2Long('D', 2, 0, 0) #define DICTVERSION Byte2Long('D', 2, 0, 0)

73
include/sj3core/Struct.h
View file

@ -37,28 +37,28 @@
#define STRUCT_H #define STRUCT_H
typedef struct global { typedef struct global {
JREC *Jmaxjptr; JREC* Jmaxjptr;
CLREC *Jmaxclptr; CLREC* Jmaxclptr;
JREC *Jjrt1st; JREC* Jjrt1st;
CLREC *Jclt1st; CLREC* Jclt1st;
JREC *Jjrt2nd; JREC* Jjrt2nd;
CLREC *Jclt2nd; CLREC* Jclt2nd;
CLREC *Jselcl; CLREC* Jselcl;
short Jselectid; short Jselectid;
short Jtrank; short Jtrank;
short Jnrank; short Jnrank;
u_char *Jinputyomi; u_char* Jinputyomi;
u_char *Jcnvstart; u_char* Jcnvstart;
short Jcnvlen; short Jcnvlen;
u_char *Jystart; u_char* Jystart;
u_char Jhyomi[MAXPHINPUTLEN + 1]; u_char Jhyomi[MAXPHINPUTLEN + 1];
u_char Jorgyomi[MAXCLINPUTLEN*2 + 1]; u_char Jorgyomi[MAXCLINPUTLEN * 2 + 1];
u_char Jkanjibuf[MINPHOUTPUTLEN]; u_char Jkanjibuf[MINPHOUTPUTLEN];
u_char *Jkanjipos; u_char* Jkanjipos;
u_char *Jkanjitmp; u_char* Jkanjitmp;
short Jkanjilen; short Jkanjilen;
u_char Jdicinl; u_char Jdicinl;
@ -81,76 +81,75 @@ typedef struct global {
short Jkhcount; short Jkhcount;
short Jnkhcount; short Jnkhcount;
KHREC Jkouhotbl[MAXKOUHONUMBER]; KHREC Jkouhotbl[MAXKOUHONUMBER];
STDYIN *Jstdytop; STDYIN* Jstdytop;
DICT *Jcurdict; DICT* Jcurdict;
DICTL *Jdictlist; DICTL* Jdictlist;
u_char *Jdicbuf; u_char* Jdicbuf;
u_char *Jidxbuf; u_char* Jidxbuf;
TypeIdxOfs *Jidxofs; TypeIdxOfs* Jidxofs;
u_char *Jaskknj[MAXKNJASKNUMBER]; u_char* Jaskknj[MAXKNJASKNUMBER];
u_char *Jaskknj_k[MAXKNJASKNUMBER]; u_char* Jaskknj_k[MAXKNJASKNUMBER];
STDY *Jcurstdy; STDY* Jcurstdy;
u_short Jsuuji_wbuf[NUMWORDBUF]; u_short Jsuuji_wbuf[NUMWORDBUF];
u_char Jsuuji_ubuf[NUMKETALENGTH]; u_char Jsuuji_ubuf[NUMKETALENGTH];
TypeClass Jsuuji_class; TypeClass Jsuuji_class;
u_char Jsuuji_comma; u_char Jsuuji_comma;
u_char Jsuuji_keta; u_char Jsuuji_keta;
u_char *Jsuuji_yptr; u_char* Jsuuji_yptr;
u_char Jsuuji_len; u_char Jsuuji_len;
u_char Jsuuji_exit; u_char Jsuuji_exit;
u_short *Jsuuji_wkeep; u_short* Jsuuji_wkeep;
u_char *Jsuuji_ukeep; u_char* Jsuuji_ukeep;
u_char Jpeepyomi[MAXWDYOMILEN * 2 + 1]; u_char Jpeepyomi[MAXWDYOMILEN * 2 + 1];
u_char Jpeepknj[MAXWDKANJILEN + 1]; u_char Jpeepknj[MAXWDKANJILEN + 1];
TypeGram Jpeepgrm; TypeGram Jpeepgrm;
u_char *Jpeepdptr; u_char* Jpeepdptr;
u_char *Jpeephptr; u_char* Jpeephptr;
u_char *Jpeepkptr; u_char* Jpeepkptr;
TypeDicSeg Jpeepidx; TypeDicSeg Jpeepidx;
} Global; } Global;
typedef struct dictfile { typedef struct dictfile {
DICT dict; DICT dict;
int refcnt; int refcnt;
#ifdef SJ3_LOCK #ifdef SJ3_LOCK
fd_set lock; fd_set lock;
#endif #endif
FILE *fp; FILE* fp;
int fd; int fd;
u_char *buffer; u_char* buffer;
long bufsiz; long bufsiz;
long idxstrt; long idxstrt;
long segstrt; long segstrt;
TypeIdxOfs *ofsptr; TypeIdxOfs* ofsptr;
struct dictfile *link; struct dictfile* link;
} DictFile; } DictFile;
typedef struct stdyfile { typedef struct stdyfile {
STDY stdy; STDY stdy;
int refcnt; int refcnt;
ino_t inode; ino_t inode;
FILE *fp; FILE* fp;
int fd; int fd;
u_char *header; u_char* header;
struct stdyfile *link; struct stdyfile* link;
} StdyFile; } StdyFile;
typedef struct workarea { typedef struct workarea {
int refcnt; int refcnt;
int lock; int lock;
struct workarea *link; struct workarea* link;
Global global; Global global;
} WorkArea; } WorkArea;

10
include/sj3core/sj3lowlib.h
View file

@ -36,10 +36,6 @@
#ifndef SJ3LOWLIB_H #ifndef SJ3LOWLIB_H
#define SJ3LOWLIB_H #define SJ3LOWLIB_H
typedef struct sj3_client_env { typedef struct sj3_client_env {
int fd; int fd;
int serv_dead_flg; int serv_dead_flg;
@ -49,11 +45,8 @@ typedef struct sj3_client_env {
char default_char[2]; char default_char[2];
} SJ3_CLIENT_ENV; } SJ3_CLIENT_ENV;
#ifndef SJ3_NAME_LENGTH #ifndef SJ3_NAME_LENGTH
# define SJ3_NAME_LENGTH 128 #define SJ3_NAME_LENGTH 128
#endif #endif
typedef struct sj3_who_struct { typedef struct sj3_who_struct {
int fd; int fd;
@ -62,7 +55,6 @@ typedef struct sj3_who_struct {
char progname[SJ3_NAME_LENGTH]; char progname[SJ3_NAME_LENGTH];
} SJ3_WHO_STRUCT; } SJ3_WHO_STRUCT;
#define MBCODE_SJIS 1 #define MBCODE_SJIS 1
#define MBCODE_EUC 2 #define MBCODE_EUC 2

11
include/sj3core/sj_connect.h
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:01:00 $ * $SonyDate: 1994/06/03 08:01:00 $
*/ */
#ifndef _SJ_CONNECT #ifndef _SJ_CONNECT
#define _SJ_CONNECT #define _SJ_CONNECT
@ -274,12 +270,11 @@
#define yoi_x 0 #define yoi_x 0
#define yaru_x 0 #define yaru_x 0
#ifdef HORI #ifdef HORI
\244\303\244\277\244\351\244\267\244\244\244\316 \244\316\276\360\312\363\244\362\304\311\262\303 1/31 \244\303\244\277\244\351\244\267\244\244\244\316 \244\316\276\360\312\363\244\362\304\311\262\303 1 / 31
#endif #endif
#define ttarasii_x 0 #define ttarasii_x 0
#define wo_o 0x80 #define wo_o 0x80
#define ttatte_o 0x40 #define ttatte_o 0x40
#define ttara_o 0x20 #define ttara_o 0x20
@ -419,7 +414,6 @@
#define n_si_o 0x20 #define n_si_o 0x20
#define deha_o 0x10 #define deha_o 0x10
#define gotosi_o 0x80 #define gotosi_o 0x80
#define saseru_o 0x40 #define saseru_o 0x40
#define zaru_o 0x20 #define zaru_o 0x20
@ -515,10 +509,9 @@
#define yaru_o 0x20 #define yaru_o 0x20
#ifdef HORI #ifdef HORI
\244\303\244\277\244\351\244\267\244\244\244\316 \244\316\276\360\312\363\244\362\304\311\262\303 1/31 \244\303\244\277\244\351\244\267\244\244\244\316 \244\316\276\360\312\363\244\362\304\311\262\303 1 / 31
#endif #endif
#define ttarasii_o 0x10 #define ttarasii_o 0x10
#endif #endif

4
include/sj3core/sj_const.h
View file

@ -105,7 +105,6 @@
#define EUC_a4 (u_char)0xa4 #define EUC_a4 (u_char)0xa4
#define EUC_a5 (u_char)0xa5 #define EUC_a5 (u_char)0xa5
#define EUC_START (u_char)0xa1 #define EUC_START (u_char)0xa1
#define EUC_END (u_char)0xfe #define EUC_END (u_char)0xfe
#define EUC_END_KIGOU (u_char)0xae #define EUC_END_KIGOU (u_char)0xae
@ -149,7 +148,6 @@
#define SETTOU_KIGOU 4 #define SETTOU_KIGOU 4
#define NUMKETALENGTH 16 #define NUMKETALENGTH 16
#define NUMWORDBUF ((NUMKETALENGTH+3)/4) #define NUMWORDBUF ((NUMKETALENGTH + 3) / 4)
#endif #endif

10
include/sj3core/sj_dict.h
View file

@ -33,16 +33,10 @@
* $SonyDate: 1994/06/03 08:01:03 $ * $SonyDate: 1994/06/03 08:01:03 $
*/ */
#ifndef _SJ_DICT #ifndef _SJ_DICT
#define _SJ_DICT #define _SJ_DICT
#define DIC_MAIN 0 #define DIC_MAIN 0
#define DIC_USER 1 #define DIC_USER 1
@ -54,8 +48,6 @@
#define HINSIBLKTERM 0xff #define HINSIBLKTERM 0xff
#define MAXSEGMENTNUMBER 0xffff #define MAXSEGMENTNUMBER 0xffff
#define NORMALKANJIMASK 0x7f #define NORMALKANJIMASK 0x7f
#define SS3KANJI 0x0080 #define SS3KANJI 0x0080
#define ZENHIRAASSYUKU 0x80 #define ZENHIRAASSYUKU 0x80
@ -81,7 +73,6 @@
#define ASSYUKUYOMITOP 0x80 #define ASSYUKUYOMITOP 0x80
#define NOKORIYOMITOP 0x40 #define NOKORIYOMITOP 0x40
#define getsize(p) (((int)(*(p) & 0x0f) * 0x100) + *((p) + 1)) #define getsize(p) (((int)(*(p) & 0x0f) * 0x100) + *((p) + 1))
#define getntag(p) ((*(p) == DICSEGTERM) ? (p) : (p) + getsize(p)) #define getntag(p) ((*(p) == DICSEGTERM) ? (p) : (p) + getsize(p))
@ -95,4 +86,3 @@
#define segend(p) (*(p) == DICSEGTERM || (p) >= dicbuf + curdict->seglen) #define segend(p) (*(p) == DICSEGTERM || (p) >= dicbuf + curdict->seglen)
#endif #endif

6
include/sj3core/sj_global.h
View file

@ -36,9 +36,9 @@
#ifndef SJ_GLOBAL_H #ifndef SJ_GLOBAL_H
#define SJ_GLOBAL_H #define SJ_GLOBAL_H
extern Global *global_work_base; extern Global* global_work_base;
extern Global *work_base; extern Global* work_base;
extern STDY *stdy_base; extern STDY* stdy_base;
extern int serv_errno; extern int serv_errno;
#endif #endif

262
include/sj3core/sj_kanakan.h
View file

@ -39,23 +39,23 @@
*/ */
/* adddic.c */ /* adddic.c */
u_int adddic(u_char *, u_char *, TypeGram); u_int adddic(u_char*, u_char*, TypeGram);
/* addelcmn.c */ /* addelcmn.c */
void set_size(u_char *, int, int, int); void set_size(u_char*, int, int, int);
u_int addel_arg(u_char *, u_char *, TypeGram, u_char *, int); u_int addel_arg(u_char*, u_char*, TypeGram, u_char*, int);
int cvtknj(u_char *, u_char *, u_char *); int cvtknj(u_char*, u_char*, u_char*);
int srchkana(u_char **, int *); int srchkana(u_char**, int*);
int srchgram(u_char *, u_char **, TypeGram); int srchgram(u_char*, u_char**, TypeGram);
int srchkanji(u_char **, u_char *, int); int srchkanji(u_char**, u_char*, int);
TypeIdxOfs count_uidx(void); TypeIdxOfs count_uidx(void);
void chg_uidx(TypeDicSeg, u_char *, int); void chg_uidx(TypeDicSeg, u_char*, int);
/* alloc.c */ /* alloc.c */
JREC *alloc_jrec(void); JREC* alloc_jrec(void);
void free_jrec(JREC *); void free_jrec(JREC*);
CLREC *alloc_clrec(void); CLREC* alloc_clrec(void);
void free_clrec(CLREC *); void free_clrec(CLREC*);
/* charsize.c */ /* charsize.c */
int codesize(u_char); int codesize(u_char);
@ -64,46 +64,46 @@ int codesize(u_char);
extern u_char chrtbl[256]; extern u_char chrtbl[256];
/* cl2knj.c */ /* cl2knj.c */
int cl2knj(u_char *, int, u_char *); int cl2knj(u_char*, int, u_char*);
int nextcl(u_char *, int); int nextcl(u_char*, int);
int prevcl(u_char *, int); int prevcl(u_char*, int);
int selectnum(void); int selectnum(void);
/* clstudy.c */ /* clstudy.c */
int clstudy(u_char *, u_char *, STDYOUT *); int clstudy(u_char*, u_char*, STDYOUT*);
void delclsub(u_char *); void delclsub(u_char*);
void mkclidx(void); void mkclidx(void);
/* cmpstr.c */ /* cmpstr.c */
int cmpstr(u_char *, u_char *); int cmpstr(u_char*, u_char*);
/* conjunc.c */ /* conjunc.c */
extern u_char *conjadr[]; extern u_char* conjadr[];
/* connect.c */ /* connect.c */
extern u_char connadr[]; extern u_char connadr[];
extern u_char *rigtadr[]; extern u_char* rigtadr[];
/* cvtclknj.c */ /* cvtclknj.c */
void cvtclknj(void); void cvtclknj(void);
/* cvtdict.c */ /* cvtdict.c */
void cvtdict(KHREC *, CLREC *, int); void cvtdict(KHREC*, CLREC*, int);
void cvtminasi(int); void cvtminasi(int);
void cvtwakachi(CLREC *); void cvtwakachi(CLREC*);
/* cvtkanji.c */ /* cvtkanji.c */
void cvtphknj(void); void cvtphknj(void);
void cvtkouho(KHREC *); void cvtkouho(KHREC*);
void setstyrec(KHREC *); void setstyrec(KHREC*);
/* deldic.c */ /* deldic.c */
u_int deldic(u_char *, u_char *, TypeGram); u_int deldic(u_char*, u_char*, TypeGram);
/* dict.c */ /* dict.c */
void get_askknj(void); void get_askknj(void);
int seldict(TypeDicID); int seldict(TypeDicID);
u_char *get_idxptr(TypeDicSeg); u_char* get_idxptr(TypeDicSeg);
/* functbl.c */ /* functbl.c */
extern VFunc cvtnum_func[]; extern VFunc cvtnum_func[];
@ -112,45 +112,45 @@ extern IFunc setjrec_func[];
extern IFunc hiraknj_func[]; extern IFunc hiraknj_func[];
/* fuzoku.c */ /* fuzoku.c */
void setclrec(JREC *, u_char *, TypeCnct); void setclrec(JREC*, u_char*, TypeCnct);
RECURS void srchfzk(JREC *, u_char *, TypeCnct, int); RECURS void srchfzk(JREC*, u_char*, TypeCnct, int);
/* fzkyomi.c */ /* fzkyomi.c */
extern u_char *fzkadr[]; extern u_char* fzkadr[];
/* getkanji.c */ /* getkanji.c */
u_char *getkan_none(u_char *, u_char *, u_char *, int, int); u_char* getkan_none(u_char*, u_char*, u_char*, int, int);
u_char *getkan_hira(u_char *, u_char *, u_char *, int, int); u_char* getkan_hira(u_char*, u_char*, u_char*, int, int);
u_char *getkan_kata(u_char *, u_char *, u_char *, int, int); u_char* getkan_kata(u_char*, u_char*, u_char*, int, int);
u_char *getkan_knj(u_char *, u_char *, u_char *, int, int); u_char* getkan_knj(u_char*, u_char*, u_char*, int, int);
u_char *getkan_ofs(u_char *, u_char *, u_char *, int, int); u_char* getkan_ofs(u_char*, u_char*, u_char*, int, int);
u_char *getkan_norm(u_char *, u_char *, u_char *, int, int); u_char* getkan_norm(u_char*, u_char*, u_char*, int, int);
u_char *getkan_ascii(u_char *, u_char *, u_char *, int, int); u_char* getkan_ascii(u_char*, u_char*, u_char*, int, int);
int getkanji(u_char *, int, u_char *, u_char *); int getkanji(u_char*, int, u_char*, u_char*);
/* getrank.c */ /* getrank.c */
void getrank(void); void getrank(void);
/* hzstrlen.c */ /* hzstrlen.c */
int euc_codesize(u_char c); int euc_codesize(u_char c);
int hzstrlen(u_char *, int); int hzstrlen(u_char*, int);
/* init.c */ /* init.c */
void seg_count(DICT *); void seg_count(DICT*);
void mkidxtbl(DICT *); void mkidxtbl(DICT*);
void initwork(void); void initwork(void);
/* istrcmp.c */ /* istrcmp.c */
int istrcmp(u_char *, u_char *, int, int); int istrcmp(u_char*, u_char*, int, int);
/* memcpy.c */ /* memcpy.c */
void sstrncpy(u_char *, u_char *, int); void sstrncpy(u_char*, u_char*, int);
/* memory.c */ /* memory.c */
JREC *free_jlst(JREC *); JREC* free_jlst(JREC*);
CLREC *free_clst(CLREC *, int); CLREC* free_clst(CLREC*, int);
void free_clall(CLREC *); void free_clall(CLREC*);
void free_jall(JREC *); void free_jall(JREC*);
void freework(void); void freework(void);
/* mk2claus.c */ /* mk2claus.c */
@ -158,58 +158,58 @@ void mk2claus(void);
/* mkbunset.c */ /* mkbunset.c */
void mkbunsetu(void); void mkbunsetu(void);
CLREC *argclrec(int); CLREC* argclrec(int);
/* mkjiritu.c */ /* mkjiritu.c */
void mkjiritu(int); void mkjiritu(int);
JREC *argjrec(int, JREC *); JREC* argjrec(int, JREC*);
/* mkkouho.c */ /* mkkouho.c */
void mkkouho(void); void mkkouho(void);
u_char *makekan_none(u_char *, u_char *, int); u_char* makekan_none(u_char*, u_char*, int);
u_char *makekan_1byte(u_char *, u_char *, int); u_char* makekan_1byte(u_char*, u_char*, int);
u_char *makekan_knj(u_char *, u_char *, int); u_char* makekan_knj(u_char*, u_char*, int);
u_char *makekan_ofs(u_char *, u_char *, int); u_char* makekan_ofs(u_char*, u_char*, int);
u_char *makekan_norm(u_char *, u_char *, int); u_char* makekan_norm(u_char*, u_char*, int);
u_char *makekan_ascii(u_char *, u_char *, int); u_char* makekan_ascii(u_char*, u_char*, int);
int sel_sjmode(JREC *); int sel_sjmode(JREC*);
/* mknumber.c */ /* mknumber.c */
void num_type00(u_char *, u_char *, JREC *); void num_type00(u_char*, u_char*, JREC*);
void num_type01(u_char *, u_char *, JREC *); void num_type01(u_char*, u_char*, JREC*);
void num_type02(u_char *, u_char *, JREC *); void num_type02(u_char*, u_char*, JREC*);
void num_type03(u_char *, u_char *, JREC *); void num_type03(u_char*, u_char*, JREC*);
void num_type04(u_char *, u_char *, JREC *); void num_type04(u_char*, u_char*, JREC*);
void num_type05(u_char *, u_char *, JREC *); void num_type05(u_char*, u_char*, JREC*);
void num_type06(u_char *, u_char *, JREC *); void num_type06(u_char*, u_char*, JREC*);
void num_type07(u_char *, u_char *, JREC *); void num_type07(u_char*, u_char*, JREC*);
void num_type08(u_char *, u_char *, JREC *); void num_type08(u_char*, u_char*, JREC*);
void num_type09(u_char *, u_char *, JREC *); void num_type09(u_char*, u_char*, JREC*);
void num_type10(u_char *, u_char *, JREC *); void num_type10(u_char*, u_char*, JREC*);
void num_type11(u_char *, u_char *, JREC *); void num_type11(u_char*, u_char*, JREC*);
void num_type12(u_char *, u_char *, JREC *); void num_type12(u_char*, u_char*, JREC*);
void num_type13(u_char *, u_char *, JREC *); void num_type13(u_char*, u_char*, JREC*);
void num_type14(u_char *, u_char *, JREC *); void num_type14(u_char*, u_char*, JREC*);
/* mvmemd.c */ /* mvmemd.c */
void mvmemd(u_char *, u_char *, int); void mvmemd(u_char*, u_char*, int);
/* mvmemi.c */ /* mvmemi.c */
void mvmemi(u_char *, u_char *, int); void mvmemi(u_char*, u_char*, int);
/* peepdic.c */ /* peepdic.c */
int getusr(u_char *); int getusr(u_char*);
int nextusr(u_char *); int nextusr(u_char*);
int prevusr(u_char *); int prevusr(u_char*);
/* ph2knj.c */ /* ph2knj.c */
int ph2knj(u_char *, u_char *, int); int ph2knj(u_char*, u_char*, int);
/* ph_khtbl.c */ /* ph_khtbl.c */
int ph_khtbl(CLREC *); int ph_khtbl(CLREC*);
/* priority.c */ /* priority.c */
int priority(CLREC *); int priority(CLREC*);
void pritiny(void); void pritiny(void);
/* prtytbl.c */ /* prtytbl.c */
@ -220,72 +220,72 @@ extern u_char sttpri[5][31];
extern u_char kigou[]; extern u_char kigou[];
/* sdepend.c */ /* sdepend.c */
DictFile *opendict(char *, char *); DictFile* opendict(char*, char*);
int closedict(DictFile *); int closedict(DictFile*);
void lock_dict(DictFile *, int); void lock_dict(DictFile*, int);
void unlock_dict(DictFile *, int); void unlock_dict(DictFile*, int);
int is_dict_locked(DictFile *); int is_dict_locked(DictFile*);
StdyFile *openstdy(char *, char *); StdyFile* openstdy(char*, char*);
int closestdy(StdyFile *); int closestdy(StdyFile*);
int putstydic(void); int putstydic(void);
int putcldic(void); int putcldic(void);
int makedict(char *, int, int, int); int makedict(char*, int, int, int);
int makestdy(char *, int, int, int); int makestdy(char*, int, int, int);
void sj_closeall(void); void sj_closeall(void);
int set_dictpass(DictFile *, char *); int set_dictpass(DictFile*, char*);
int set_stdypass(char *); int set_stdypass(char*);
int set_dictcmnt(DictFile *, char *); int set_dictcmnt(DictFile*, char*);
int set_stdycmnt(char *); int set_stdycmnt(char*);
int get_stdysize(int *, int *, int *); int get_stdysize(int*, int*, int*);
/* selclrec.c */ /* selclrec.c */
void selclrec(void); void selclrec(void);
/* selsuuji.c */ /* selsuuji.c */
extern u_short *selsjadrs[]; extern u_short* selsjadrs[];
/* setconj.c */ /* setconj.c */
int setconj(TypeGram, JREC *, CREC *); int setconj(TypeGram, JREC*, CREC*);
/* setjrec.c */ /* setjrec.c */
int setj_atrb(u_char *); int setj_atrb(u_char*);
int setj_ofs(u_char *); int setj_ofs(u_char*);
int setj_knj(u_char *); int setj_knj(u_char*);
int setj_norm1(u_char *); int setj_norm1(u_char*);
int setj_norm2(u_char *); int setj_norm2(u_char*);
int setj_norm3(u_char *); /* unused??? */ int setj_norm3(u_char*); /* unused??? */
void setjrec(u_char *, int); void setjrec(u_char*, int);
void setnumrec(u_char *, JREC *, TypeGram); void setnumrec(u_char*, JREC*, TypeGram);
void setcrec(u_char *); void setcrec(u_char*);
/* setkouho.c */ /* setkouho.c */
void setkouho(CLREC *, TypeDicOfs, int); void setkouho(CLREC*, TypeDicOfs, int);
void ph_setkouho(CLREC *, TypeDicOfs, STDYIN *); void ph_setkouho(CLREC*, TypeDicOfs, STDYIN*);
int hiraknj_atrb(u_char *, int *); int hiraknj_atrb(u_char*, int*);
int hiraknj_ofs(u_char *, int *); int hiraknj_ofs(u_char*, int*);
int hiraknj_knj(u_char *, int *); int hiraknj_knj(u_char*, int*);
int hiraknj_hask(u_char *, int *); int hiraknj_hask(u_char*, int*);
int hiraknj_kask(u_char *, int *); int hiraknj_kask(u_char*, int*);
int hiraknj_norm(u_char *, int *); int hiraknj_norm(u_char*, int*);
int hiraknj_hira(u_char *, int *); int hiraknj_hira(u_char*, int*);
/* setubi.c */ /* setubi.c */
u_char *getstb(TypeGram); u_char* getstb(TypeGram);
void setubi(JREC *, u_char *); void setubi(JREC*, u_char*);
/* sj2code.c */ /* sj2code.c */
int sj2cd_chr(u_char *, u_char *); int sj2cd_chr(u_char*, u_char*);
int sj2cd_str(u_char *, u_char *, int); int sj2cd_str(u_char*, u_char*, int);
/* skiphblk.c */ /* skiphblk.c */
u_char *skiphblk(u_char *); u_char* skiphblk(u_char*);
/* skipkstr.c */ /* skipkstr.c */
u_char *skipkstr(u_char *); u_char* skipkstr(u_char*);
/* srchdict.c */ /* srchdict.c */
int yomicmp(u_char *, u_char *, u_char *); int yomicmp(u_char*, u_char*, u_char*);
u_char *srchdict(u_char *); u_char* srchdict(u_char*);
/* srchhead.c */ /* srchhead.c */
int srchhead(void); int srchhead(void);
@ -295,28 +295,28 @@ TypeDicSeg srchidx(TypeDicSeg, int);
/* srchnum.c*/ /* srchnum.c*/
void srchnum(void); void srchnum(void);
void setwdnum(u_char *, int, u_short *); void setwdnum(u_char*, int, u_short*);
int setucnum(u_char *, int, u_char *); int setucnum(u_char*, int, u_char*);
/* sstrcmp.c */ /* sstrcmp.c */
int sstrcmp(u_char *, u_char *); int sstrcmp(u_char*, u_char*);
/* sstrlen.c */ /* sstrlen.c */
int sstrlen(u_char *); int sstrlen(u_char*);
/* sstrncmp.c */ /* sstrncmp.c */
int sstrncmp(u_char *, u_char *dst, int); int sstrncmp(u_char*, u_char* dst, int);
/* stbtbl.c */ /* stbtbl.c */
extern u_char *stbadr[]; extern u_char* stbadr[];
/* stttbl.c */ /* stttbl.c */
extern u_char *settou_ptr[]; extern u_char* settou_ptr[];
extern u_char scncttbl[2][24]; extern u_char scncttbl[2][24];
/* study.c */ /* study.c */
int study(STDYOUT *); int study(STDYOUT*);
STDYIN *srchstdy(TypeDicSeg, TypeDicOfs, TypeDicID); STDYIN* srchstdy(TypeDicSeg, TypeDicOfs, TypeDicID);
/* suujitbl.c */ /* suujitbl.c */
extern u_char suuji_tbl[]; extern u_char suuji_tbl[];
@ -330,7 +330,7 @@ extern u_char num5tbl[];
extern u_char num6tbl[]; extern u_char num6tbl[];
/* terminat.c */ /* terminat.c */
int terminate(TypeCnct, u_char *); int terminate(TypeCnct, u_char*);
/* termtbl.c */ /* termtbl.c */
extern u_char termtbl[]; extern u_char termtbl[];
@ -338,6 +338,4 @@ extern u_char termtbl[];
/* wakachi.c */ /* wakachi.c */
void wakachi(void); void wakachi(void);
#endif /* KANAKAN_H */ #endif /* KANAKAN_H */

12
include/sj3core/sj_left.h
View file

@ -33,17 +33,10 @@
* $SonyDate: 1994/06/03 08:01:12 $ * $SonyDate: 1994/06/03 08:01:12 $
*/ */
#ifndef _SJ_LEFT #ifndef _SJ_LEFT
#define _SJ_LEFT #define _SJ_LEFT
#define L_WO 0x01 #define L_WO 0x01
#define L_TTATTE 0x02 #define L_TTATTE 0x02
#define L_TTARA 0x03 #define L_TTARA 0x03
@ -183,8 +176,6 @@
#define L_N_SI 0x7b #define L_N_SI 0x7b
#define L_DEHA 0x7c #define L_DEHA 0x7c
#define L_GOTOSI 0x81 #define L_GOTOSI 0x81
#define L_SASERU 0x82 #define L_SASERU 0x82
#define L_ZARU 0x83 #define L_ZARU 0x83
@ -230,9 +221,6 @@
#define L_RERU 0xa7 #define L_RERU 0xa7
#define L_SITE 0xa8 #define L_SITE 0xa8
#define L_YOUGEN 0xa9 #define L_YOUGEN 0xa9
#define L_ARU 0xaa #define L_ARU 0xaa
#define L_ARA 0xab #define L_ARA 0xab

7
include/sj3core/sj_prty.h
View file

@ -33,17 +33,10 @@
* $SonyDate: 1994/06/03 08:01:13 $ * $SonyDate: 1994/06/03 08:01:13 $
*/ */
#ifndef _SJ_PRIORITY #ifndef _SJ_PRIORITY
#define _SJ_PRIORITY #define _SJ_PRIORITY
#define RENTAI 0x10 #define RENTAI 0x10
#define GETPRI 0x0f #define GETPRI 0x0f

271
include/sj3core/sj_rename.h
View file

@ -33,7 +33,6 @@
* $SonyDate: 1994/06/03 08:01:14 $ * $SonyDate: 1994/06/03 08:01:14 $
*/ */
#ifndef _SJ_RENAME #ifndef _SJ_RENAME
#define _SJ_RENAME #define _SJ_RENAME
@ -47,8 +46,6 @@
#define sprt_seg Jsprt_seg #define sprt_seg Jsprt_seg
#define apnd_uidx Japnd_uidx #define apnd_uidx Japnd_uidx
#define set_size Jset_size #define set_size Jset_size
#define isvyomi Jisvyomi #define isvyomi Jisvyomi
#define isvknj Jisvknj #define isvknj Jisvknj
@ -64,8 +61,6 @@
#define count_uidx Jcount_uidx #define count_uidx Jcount_uidx
#define chg_uidx Jchg_uidx #define chg_uidx Jchg_uidx
#define cl2knj Jcl2knj #define cl2knj Jcl2knj
#define nextcl Jnextcl #define nextcl Jnextcl
#define nextrecblk Jnextrecblk #define nextrecblk Jnextrecblk
@ -75,8 +70,6 @@
#define selectnum Jselectnum #define selectnum Jselectnum
#define kouhonum Jkouhonum #define kouhonum Jkouhonum
#define clstudy Jclstudy #define clstudy Jclstudy
#define delcldata Jdelcldata #define delcldata Jdelcldata
#define delclsub Jdelclsub #define delclsub Jdelclsub
@ -84,47 +77,33 @@
#define srchclpos Jsrchclpos #define srchclpos Jsrchclpos
#define mkclidx Jmkclidx #define mkclidx Jmkclidx
#define cvtclknj Jcvtclknj #define cvtclknj Jcvtclknj
#define cvtdict Jcvtdict #define cvtdict Jcvtdict
#define cvtminasi Jcvtminasi #define cvtminasi Jcvtminasi
#define cvtwakachi Jcvtwakachi #define cvtwakachi Jcvtwakachi
#define cvtphknj Jcvtphknj #define cvtphknj Jcvtphknj
#define cvtkouho Jcvtkouho #define cvtkouho Jcvtkouho
#define setstyrec Jsetstyrec #define setstyrec Jsetstyrec
#define deldic Jdeldic #define deldic Jdeldic
#define del_douon Jdel_douon #define del_douon Jdel_douon
#define del_segment Jdel_segment #define del_segment Jdel_segment
#define del_uidx Jdel_uidx #define del_uidx Jdel_uidx
#define del_stdy Jdel_stdy #define del_stdy Jdel_stdy
#define get_askknj Jget_askknj #define get_askknj Jget_askknj
#define seldict Jseldict #define seldict Jseldict
#define sel_udict Jsel_udict #define sel_udict Jsel_udict
#define get_idxofs Jget_idxofs #define get_idxofs Jget_idxofs
#define get_idxptr Jget_idxptr #define get_idxptr Jget_idxptr
#define fzkstrcmp Jfzkstrcmp #define fzkstrcmp Jfzkstrcmp
#define setclrec Jsetclrec #define setclrec Jsetclrec
#define fzkcnct Jfzkcnct #define fzkcnct Jfzkcnct
#define srchfzk Jsrchfzk #define srchfzk Jsrchfzk
#define getkan_none Jgetkan_none #define getkan_none Jgetkan_none
#define getkan_hira Jgetkan_hira #define getkan_hira Jgetkan_hira
#define getkan_kata Jgetkan_kata #define getkan_kata Jgetkan_kata
@ -134,100 +113,91 @@
#define code2kanji Jcode2kanji #define code2kanji Jcode2kanji
#define getkanji Jgetkanji #define getkanji Jgetkanji
#define getrank Jgetrank #define getrank Jgetrank
#define setstynum Jsetstynum #define setstynum Jsetstynum
#define setnspr Jsetnspr #define setnspr Jsetnspr
#define regetrank Jregetrank #define regetrank Jregetrank
#define work_base Jwork_base #define work_base Jwork_base
#define stdy_base Jstdy_base #define stdy_base Jstdy_base
#define maxjptr (work_base->Jmaxjptr)
#define maxclptr (work_base->Jmaxclptr)
#define jrt1st (work_base->Jjrt1st)
#define clt1st (work_base->Jclt1st)
#define jrt2nd (work_base->Jjrt2nd)
#define clt2nd (work_base->Jclt2nd)
#define selcl (work_base->Jselcl)
#define selectid (work_base->Jselectid)
#define trank (work_base->Jtrank)
#define nrank (work_base->Jnrank)
#define buninf (work_base->Jbuninf)
#define buncnt (work_base->Jbuncnt)
#define knjnew (work_base->Jknjnew)
#define knjidx (work_base->Jknjidx)
#define knjmax (work_base->Jknjmax)
#define score (work_base->Jscore)
#define pathnum (work_base->Jpathnum)
#define usedpath (work_base->Jusedpath)
#define inputyomi (work_base->Jinputyomi)
#define cnvstart (work_base->Jcnvstart)
#define cnvlen (work_base->Jcnvlen)
#define ystart (work_base->Jystart)
#define hyomi (work_base->Jhyomi)
#define orgyomi (work_base->Jorgyomi)
#define kanjibuf (work_base->Jkanjibuf)
#define kanjipos (work_base->Jkanjipos)
#define kanjitmp (work_base->Jkanjitmp)
#define kanjilen (work_base->Jkanjilen)
#define dicinl (work_base->Jdicinl)
#define dicsaml (work_base->Jdicsaml)
#define prevseg (work_base->Jprevseg)
#define fzkcount (work_base->Jfzkcount)
#define fzk_ka_flg (work_base->Jfzk_ka_flg)
#define fzktbl (work_base->Jfzktbl)
#define headcode (work_base->Jheadcode)
#define headlen (work_base->Jheadlen)
#define gobilen (work_base->Jgobilen)
#define prevclgrm (work_base->Jprevclgrm)
#define prevclrow (work_base->Jprevclrow)
#define nextcllen (work_base->Jnextcllen)
#define khcount (work_base->Jkhcount)
#define nkhcount (work_base->Jnkhcount)
#define kouhotbl (work_base->Jkouhotbl)
#define stdytop (work_base->Jstdytop)
#define curdict (work_base->Jcurdict)
#define dictlist (work_base->Jdictlist)
#define dicbuf (work_base->Jdicbuf)
#define idxbuf (work_base->Jidxbuf)
#define idxofs (work_base->Jidxofs)
#define askknj (work_base->Jaskknj)
#define askknj_k (work_base->Jaskknj_k)
#define maxjptr (work_base -> Jmaxjptr) #define grp_ptr (work_base->Jgrp_ptr)
#define maxclptr (work_base -> Jmaxclptr) #define grp_seg (work_base->Jgrp_seg)
#define jrt1st (work_base -> Jjrt1st) #define grp_grp (work_base->Jgrp_grp)
#define clt1st (work_base -> Jclt1st) #define suuji_wbuf (work_base->Jsuuji_wbuf)
#define jrt2nd (work_base -> Jjrt2nd) #define suuji_ubuf (work_base->Jsuuji_ubuf)
#define clt2nd (work_base -> Jclt2nd) #define suuji_class (work_base->Jsuuji_class)
#define selcl (work_base -> Jselcl) #define suuji_comma (work_base->Jsuuji_comma)
#define selectid (work_base -> Jselectid) #define suuji_keta (work_base->Jsuuji_keta)
#define trank (work_base -> Jtrank) #define suuji_yptr (work_base->Jsuuji_yptr)
#define nrank (work_base -> Jnrank) #define suuji_len (work_base->Jsuuji_len)
#define buninf (work_base -> Jbuninf) #define suuji_exit (work_base->Jsuuji_exit)
#define buncnt (work_base -> Jbuncnt) #define suuji_wkeep (work_base->Jsuuji_wkeep)
#define knjnew (work_base -> Jknjnew) #define suuji_ukeep (work_base->Jsuuji_ukeep)
#define knjidx (work_base -> Jknjidx) #define peepyomi (work_base->Jpeepyomi)
#define knjmax (work_base -> Jknjmax) #define peepknj (work_base->Jpeepknj)
#define score (work_base -> Jscore) #define peepgrm (work_base->Jpeepgrm)
#define pathnum (work_base -> Jpathnum) #define peepdptr (work_base->Jpeepdptr)
#define usedpath (work_base -> Jusedpath) #define peephptr (work_base->Jpeephptr)
#define inputyomi (work_base -> Jinputyomi) #define peepkptr (work_base->Jpeepkptr)
#define cnvstart (work_base -> Jcnvstart) #define peepidx (work_base->Jpeepidx)
#define cnvlen (work_base -> Jcnvlen)
#define ystart (work_base -> Jystart)
#define hyomi (work_base -> Jhyomi)
#define orgyomi (work_base -> Jorgyomi)
#define kanjibuf (work_base -> Jkanjibuf)
#define kanjipos (work_base -> Jkanjipos)
#define kanjitmp (work_base -> Jkanjitmp)
#define kanjilen (work_base -> Jkanjilen)
#define dicinl (work_base -> Jdicinl)
#define dicsaml (work_base -> Jdicsaml)
#define prevseg (work_base -> Jprevseg)
#define fzkcount (work_base -> Jfzkcount)
#define fzk_ka_flg (work_base -> Jfzk_ka_flg)
#define fzktbl (work_base -> Jfzktbl)
#define headcode (work_base -> Jheadcode)
#define headlen (work_base -> Jheadlen)
#define gobilen (work_base -> Jgobilen)
#define prevclgrm (work_base -> Jprevclgrm)
#define prevclrow (work_base -> Jprevclrow)
#define nextcllen (work_base -> Jnextcllen)
#define khcount (work_base -> Jkhcount)
#define nkhcount (work_base -> Jnkhcount)
#define kouhotbl (work_base -> Jkouhotbl)
#define stdytop (work_base -> Jstdytop)
#define curdict (work_base -> Jcurdict)
#define dictlist (work_base -> Jdictlist)
#define dicbuf (work_base -> Jdicbuf)
#define idxbuf (work_base -> Jidxbuf)
#define idxofs (work_base -> Jidxofs)
#define askknj (work_base -> Jaskknj)
#define askknj_k (work_base -> Jaskknj_k)
#define grp_ptr (work_base -> Jgrp_ptr)
#define grp_seg (work_base -> Jgrp_seg)
#define grp_grp (work_base -> Jgrp_grp)
#define suuji_wbuf (work_base -> Jsuuji_wbuf)
#define suuji_ubuf (work_base -> Jsuuji_ubuf)
#define suuji_class (work_base -> Jsuuji_class)
#define suuji_comma (work_base -> Jsuuji_comma)
#define suuji_keta (work_base -> Jsuuji_keta)
#define suuji_yptr (work_base -> Jsuuji_yptr)
#define suuji_len (work_base -> Jsuuji_len)
#define suuji_exit (work_base -> Jsuuji_exit)
#define suuji_wkeep (work_base -> Jsuuji_wkeep)
#define suuji_ukeep (work_base -> Jsuuji_ukeep)
#define peepyomi (work_base -> Jpeepyomi)
#define peepknj (work_base -> Jpeepknj)
#define peepgrm (work_base -> Jpeepgrm)
#define peepdptr (work_base -> Jpeepdptr)
#define peephptr (work_base -> Jpeephptr)
#define peepkptr (work_base -> Jpeepkptr)
#define peepidx (work_base -> Jpeepidx)
#define seg_count Jseg_count #define seg_count Jseg_count
#define mkidxtbl Jmkidxtbl #define mkidxtbl Jmkidxtbl
#define initwork Jinitwork #define initwork Jinitwork
#define free_jlst Jfree_jlst #define free_jlst Jfree_jlst
#define free_clst Jfree_clst #define free_clst Jfree_clst
#define free_clall Jfree_clall #define free_clall Jfree_clall
@ -235,25 +205,17 @@
#define freework Jfreework #define freework Jfreework
#define free_kjall Jfree_kjall #define free_kjall Jfree_kjall
#define set2nd Jset2nd #define set2nd Jset2nd
#define mk2claus Jmk2claus #define mk2claus Jmk2claus
#define mkbunsetu Jmkbunsetu #define mkbunsetu Jmkbunsetu
#define argclrec Jargclrec #define argclrec Jargclrec
#define mkjiritu Jmkjiritu #define mkjiritu Jmkjiritu
#define dic_mu Jdic_mu #define dic_mu Jdic_mu
#define argjrec Jargjrec #define argjrec Jargjrec
#define dic_cl Jdic_cl #define dic_cl Jdic_cl
#define mkkouho Jmkkouho #define mkkouho Jmkkouho
#define getkhtbl Jgetkhtbl #define getkhtbl Jgetkhtbl
#define cl_kanji Jcl_kanji #define cl_kanji Jcl_kanji
@ -264,8 +226,6 @@
#define sel_sjmode Jsel_sjmode #define sel_sjmode Jsel_sjmode
#define cl_numcmn Jcl_numcmn #define cl_numcmn Jcl_numcmn
#define word2char Jword2char #define word2char Jword2char
#define words2num Jwords2num #define words2num Jwords2num
#define num_type00 Jnum_type00 #define num_type00 Jnum_type00
@ -286,8 +246,6 @@
#define num_type13 Jnum_type13 #define num_type13 Jnum_type13
#define num_type14 Jnum_type14 #define num_type14 Jnum_type14
#define getusr Jgetusr #define getusr Jgetusr
#define nextusr Jnextusr #define nextusr Jnextusr
#define prevusr Jprevusr #define prevusr Jprevusr
@ -302,20 +260,14 @@
#define add_yomi Jadd_yomi #define add_yomi Jadd_yomi
#define cd2sjh_chr Jcd2sjh_chr #define cd2sjh_chr Jcd2sjh_chr
#define ph2knj Jph2knj #define ph2knj Jph2knj
#define ph_setsty Jph_setsty #define ph_setsty Jph_setsty
#define nextkptr Jnextkptr #define nextkptr Jnextkptr
#define maxpset Jmaxpset #define maxpset Jmaxpset
#define mkknjmax Jmkknjmax #define mkknjmax Jmkknjmax
#define ph_khtbl Jph_khtbl #define ph_khtbl Jph_khtbl
#define isfukusi Jisfukusi #define isfukusi Jisfukusi
#define istaigen Jistaigen #define istaigen Jistaigen
#define taicnt Jtaicnt #define taicnt Jtaicnt
@ -323,12 +275,8 @@
#define priority Jpriority #define priority Jpriority
#define pritiny Jpritiny #define pritiny Jpritiny
#define selclrec Jselclrec #define selclrec Jselclrec
#define initknjall Jinitknjall #define initknjall Jinitknjall
#define knjtouroku Jknjtouroku #define knjtouroku Jknjtouroku
#define knjitti Jknjitti #define knjitti Jknjitti
@ -341,14 +289,10 @@
#define selectknj Jselectknj #define selectknj Jselectknj
#define selknj Jselknj #define selknj Jselknj
#define cnjstrcmp Jcnjstrcmp #define cnjstrcmp Jcnjstrcmp
#define cnvrow Jcnvrow #define cnvrow Jcnvrow
#define setconj Jsetconj #define setconj Jsetconj
#define setj_atrb Jsetj_atrb #define setj_atrb Jsetj_atrb
#define setj_ofs Jsetj_ofs #define setj_ofs Jsetj_ofs
#define setj_knj Jsetj_knj #define setj_knj Jsetj_knj
@ -359,8 +303,6 @@
#define setnumrec Jsetnumrec #define setnumrec Jsetnumrec
#define setcrec Jsetcrec #define setcrec Jsetcrec
#define setkouho Jsetkouho #define setkouho Jsetkouho
#define ph_setkouho Jph_setkouho #define ph_setkouho Jph_setkouho
#define hiraknj Jhiraknj #define hiraknj Jhiraknj
@ -372,18 +314,12 @@
#define hiraknj_norm Jhiraknj_norm #define hiraknj_norm Jhiraknj_norm
#define hiraknj_hira Jhiraknj_hira #define hiraknj_hira Jhiraknj_hira
#define getstb Jgetstb #define getstb Jgetstb
#define setubi Jsetubi #define setubi Jsetubi
#define sj2cd_chr Jsj2cd_chr #define sj2cd_chr Jsj2cd_chr
#define sj2cd_str Jsj2cd_str #define sj2cd_str Jsj2cd_str
#define retaiofs Jretaiofs #define retaiofs Jretaiofs
#define srchai2nd Jsrchai2nd #define srchai2nd Jsrchai2nd
#define srchai1st Jsrchai1st #define srchai1st Jsrchai1st
@ -392,14 +328,10 @@
#define srchai6th Jsrchai6th #define srchai6th Jsrchai6th
#define srchai5th Jsrchai5th #define srchai5th Jsrchai5th
#define yomicmp_sub Jyomicmp_sub #define yomicmp_sub Jyomicmp_sub
#define yomicmp Jyomicmp #define yomicmp Jyomicmp
#define srchdict Jsrchdict #define srchdict Jsrchdict
#define srchg_atrb Jsrchg_atrb #define srchg_atrb Jsrchg_atrb
#define srchg_ofs Jsrchg_ofs #define srchg_ofs Jsrchg_ofs
#define srchg_knj Jsrchg_knj #define srchg_knj Jsrchg_knj
@ -408,16 +340,10 @@
#define srchgrp2nd Jsrchgrp2nd #define srchgrp2nd Jsrchgrp2nd
#define srchgrp1st Jsrchgrp1st #define srchgrp1st Jsrchgrp1st
#define srchhead Jsrchhead #define srchhead Jsrchhead
#define srchidx Jsrchidx #define srchidx Jsrchidx
#define srch_josuu_sub Jsrch_josuu_sub #define srch_josuu_sub Jsrch_josuu_sub
#define srch_josuu Jsrch_josuu #define srch_josuu Jsrch_josuu
#define setnrec_sub Jsetnrec_sub #define setnrec_sub Jsetnrec_sub
@ -435,115 +361,62 @@
#define setwdnum Jsetwdnum #define setwdnum Jsetwdnum
#define setucnum Jsetucnum #define setucnum Jsetucnum
#define study Jstudy #define study Jstudy
#define srchstdy Jsrchstdy #define srchstdy Jsrchstdy
#define terminate Jterminate #define terminate Jterminate
#define wakachi Jwakachi #define wakachi Jwakachi
#define cmpstr Jcmpstr #define cmpstr Jcmpstr
#define hzstrlen Jhzstrlen #define hzstrlen Jhzstrlen
#define istrcmp Jistrcmp #define istrcmp Jistrcmp
#define mvmemd Jmvmemd #define mvmemd Jmvmemd
#define mvmemi Jmvmemi #define mvmemi Jmvmemi
#define skiphblk Jskiphblk #define skiphblk Jskiphblk
#define skipkstr Jskipkstr #define skipkstr Jskipkstr
#define sstrcmp Jsstrcmp #define sstrcmp Jsstrcmp
#define sstrlen Jsstrlen #define sstrlen Jsstrlen
#define sstrncmp Jsstrncmp #define sstrncmp Jsstrncmp
#define charsize Jcharsize #define charsize Jcharsize
#define chrtbl Jchrtbl #define chrtbl Jchrtbl
#define conjadr Jconjadr #define conjadr Jconjadr
#define connadr Jconnadr #define connadr Jconnadr
#define rigtadr Jrigtadr #define rigtadr Jrigtadr
#define cvtnum_func Jcvtnum_func #define cvtnum_func Jcvtnum_func
#define getkan_func Jgetkan_func #define getkan_func Jgetkan_func
#define setjrec_func Jsetjrec_func #define setjrec_func Jsetjrec_func
#define srchg_func Jsrchg_func #define srchg_func Jsrchg_func
#define hiraknj_func Jhiraknj_func #define hiraknj_func Jhiraknj_func
#define fzkadr Jfzkadr #define fzkadr Jfzkadr
#define taipri Jtaipri #define taipri Jtaipri
#define sttpri Jsttpri #define sttpri Jsttpri
#define kigou Jkigou #define kigou Jkigou
#define selsjadrs Jselsjadrs #define selsjadrs Jselsjadrs
#define stbadr Jstbadr #define stbadr Jstbadr
#define settou_ptr Jsettou_ptr #define settou_ptr Jsettou_ptr
#define scncttbl Jscncttbl #define scncttbl Jscncttbl
#define suuji_tbl Jsuuji_tbl #define suuji_tbl Jsuuji_tbl
#define kurai1_tbl Jkurai1_tbl #define kurai1_tbl Jkurai1_tbl
#define kurai2_tbl Jkurai2_tbl #define kurai2_tbl Jkurai2_tbl
@ -554,8 +427,6 @@
#define num5tbl Jnum5tbl #define num5tbl Jnum5tbl
#define num6tbl Jnum6tbl #define num6tbl Jnum6tbl
#define termtbl Jtermtbl #define termtbl Jtermtbl
#endif #endif

50
include/sj3core/sj_right.h
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:01:15 $ * $SonyDate: 1994/06/03 08:01:15 $
*/ */
#ifndef _SJ_RIGHT #ifndef _SJ_RIGHT
#define _SJ_RIGHT #define _SJ_RIGHT
@ -67,19 +63,10 @@
#define R_SASE 23 #define R_SASE 23
#define R_RARE 24 #define R_RARE 24
#define R_ITADAKE 25 #define R_ITADAKE 25
#define R_EXP 26 #define R_EXP 26
#define R_RENYOU1 27 #define R_RENYOU1 27
#define R_RENYOU5 28 #define R_RENYOU5 28
#define R_SA5RENYOU1 29 #define R_SA5RENYOU1 29
@ -128,9 +115,6 @@
#define R_YORI2 72 #define R_YORI2 72
#define R_RASHUU 73 #define R_RASHUU 73
#define R_DSHUUSI1 74 #define R_DSHUUSI1 74
#define R_DSHUUSI2 75 #define R_DSHUUSI2 75
#define R_GOTOSI 76 #define R_GOTOSI 76
@ -140,9 +124,6 @@
#define R_MAI 80 #define R_MAI 80
#define R_MITAIDA 81 #define R_MITAIDA 81
#define R_SHUUSI 82 #define R_SHUUSI 82
#define R_KSHUUSI 83 #define R_KSHUUSI 83
#define R_ZARU 84 #define R_ZARU 84
@ -156,9 +137,6 @@
#define R_NN2 92 #define R_NN2 92
#define R_RASII 93 #define R_RASII 93
#define R_DRENTAI1 94 #define R_DRENTAI1 94
#define R_DRENTAI2 95 #define R_DRENTAI2 95
#define R_DRENTAI3 96 #define R_DRENTAI3 96
@ -169,38 +147,19 @@
#define R_SOUNA2 101 #define R_SOUNA2 101
#define R_NA2 102 #define R_NA2 102
#define R_KATEI1 103 #define R_KATEI1 103
#define R_KATEI2 104 #define R_KATEI2 104
#define R_KATEI3 105 #define R_KATEI3 105
#define R_KAMEI 106 #define R_KAMEI 106
#define R_IKE 107 #define R_IKE 107
#define R_KURE 108 #define R_KURE 108
#define R_MEIREI1 109 #define R_MEIREI1 109
#define R_MEIREI2 110 #define R_MEIREI2 110
#define R_DGOKAN 111 #define R_DGOKAN 111
#define R_KGOKAN 112 #define R_KGOKAN 112
#define R_SGOKAN 113 #define R_SGOKAN 113
@ -212,14 +171,8 @@
#define R_YOU2 119 #define R_YOU2 119
#define R_SHO 120 #define R_SHO 120
#define R_FZKMEISI 121 #define R_FZKMEISI 121
#define R_AISATU 122 #define R_AISATU 122
#define R_KOSODO 123 #define R_KOSODO 123
@ -239,7 +192,6 @@
#define R_F_FUKUSI 135 #define R_F_FUKUSI 135
#define R_CUT 137 #define R_CUT 137
#define R_MIZEN2 140 #define R_MIZEN2 140
#define R_MIZEN3 141 #define R_MIZEN3 141
#define R_MIZEN4 142 #define R_MIZEN4 142
@ -352,8 +304,6 @@
#define R_NN1 240 #define R_NN1 240
#define R_SUUSI 241 #define R_SUUSI 241
#define R_SETUZOKU 242 #define R_SETUZOKU 242
#define R_KANDOU 243 #define R_KANDOU 243

54
include/sj3core/sj_struct.h
View file

@ -33,18 +33,12 @@
* $SonyDate: 1994/06/03 08:01:16 $ * $SonyDate: 1994/06/03 08:01:16 $
*/ */
#ifndef _SJ_STRUCT #ifndef _SJ_STRUCT
#define _SJ_STRUCT #define _SJ_STRUCT
typedef struct jiritu { typedef struct jiritu {
struct jiritu *jsort; struct jiritu* jsort;
TypeDicSeg jseg; TypeDicSeg jseg;
TypeDicOfs jofsst; TypeDicOfs jofsst;
TypeDicOfs jofsed; TypeDicOfs jofsed;
@ -59,12 +53,9 @@ typedef struct jiritu {
u_char numlen; u_char numlen;
} JREC; } JREC;
typedef struct bunsetu { typedef struct bunsetu {
JREC *jnode; JREC* jnode;
struct bunsetu *clsort; struct bunsetu* clsort;
u_char gobiln; u_char gobiln;
u_char cllen; u_char cllen;
@ -78,11 +69,8 @@ typedef struct bunsetu {
#endif #endif
} CLREC; } CLREC;
typedef struct kouho { typedef struct kouho {
CLREC *clrec; CLREC* clrec;
TypeDicOfs offs; TypeDicOfs offs;
TypeStyNum styno; TypeStyNum styno;
u_char rank; u_char rank;
@ -101,25 +89,17 @@ typedef struct kouho {
#endif #endif
} KHREC; } KHREC;
typedef struct conj { typedef struct conj {
u_char len; u_char len;
TypeCnct right; TypeCnct right;
} CREC; } CREC;
typedef struct fuzoku { typedef struct fuzoku {
u_char *yomip; u_char* yomip;
u_char *fzkp; u_char* fzkp;
} FREC; } FREC;
typedef struct study_in { typedef struct study_in {
TypeDicOfs offset; TypeDicOfs offset;
TypeDicSeg seg; TypeDicSeg seg;
@ -136,9 +116,6 @@ typedef struct study_in {
#endif #endif
} STDYIN; } STDYIN;
typedef struct study_out { typedef struct study_out {
STDYIN stdy1; STDYIN stdy1;
TypeGram hinshi; TypeGram hinshi;
@ -154,9 +131,6 @@ typedef struct study_out {
#endif #endif
} STDYOUT; } STDYOUT;
typedef struct dict { typedef struct dict {
TypeDicID dicid; TypeDicID dicid;
@ -174,27 +148,21 @@ typedef struct dict {
IFunc rszdic; IFunc rszdic;
} DICT; } DICT;
typedef struct dictl { typedef struct dictl {
DICT *dict; DICT* dict;
struct dictl *next; struct dictl* next;
} DICTL; } DICTL;
typedef struct stdy { typedef struct stdy {
short stdycnt; short stdycnt;
short stdymax; short stdymax;
STDYIN *stdydic; STDYIN* stdydic;
short clstdystep; short clstdystep;
u_short *clstdyidx; u_short* clstdyidx;
short clstdylen; short clstdylen;
u_char *clstdydic; u_char* clstdydic;
} STDY; } STDY;
#endif #endif

20
include/sj3core/sj_study.h
View file

@ -39,14 +39,14 @@
#define StudyExist() (stdy_base) #define StudyExist() (stdy_base)
#define STUDYCOUNT (stdy_base -> stdycnt) #define STUDYCOUNT (stdy_base->stdycnt)
#define STUDYMAX (stdy_base -> stdymax) #define STUDYMAX (stdy_base->stdymax)
#define STUDYDICT (stdy_base -> stdydic) #define STUDYDICT (stdy_base->stdydic)
#define CLSTUDYIDX (stdy_base -> clstdyidx) #define CLSTUDYIDX (stdy_base->clstdyidx)
#define CLSTUDYSTEP (stdy_base -> clstdystep) #define CLSTUDYSTEP (stdy_base->clstdystep)
#define CLSTUDYLEN (stdy_base -> clstdylen) #define CLSTUDYLEN (stdy_base->clstdylen)
#define CLSTUDYDICT (stdy_base -> clstdydic) #define CLSTUDYDICT (stdy_base->clstdydic)
#define STUDYTAIL (STUDYDICT + STUDYMAX) #define STUDYTAIL (STUDYDICT + STUDYMAX)
#define STUDYRECSIZE (sizeof(STDYIN)) #define STUDYRECSIZE (sizeof(STDYIN))
@ -74,9 +74,7 @@
#define CL_YDATA 5 #define CL_YDATA 5
#define CL_HDLEN 5 #define CL_HDLEN 5
#define iseocl(p) (!ClYomiLen(p) || (u_char*)(p) >= CLSTUDYTAIL)
#define iseocl(p) (!ClYomiLen(p) || (u_char *)(p) >= CLSTUDYTAIL)
#define ClGramCode(p) *((p) + CL_GRAM2) #define ClGramCode(p) *((p) + CL_GRAM2)
#define ClYomiLen(p) *((p) + CL_YLEN) #define ClYomiLen(p) *((p) + CL_YLEN)
@ -84,7 +82,7 @@
#define ClHighNum(p) *(p + CL_NUMH) #define ClHighNum(p) *(p + CL_NUMH)
#define ClLowNum(p) *(p + CL_NUML) #define ClLowNum(p) *(p + CL_NUML)
#define ClGetNum(p) (ClHighNum(p) * 0x100 + ClLowNum(p)) #define ClGetNum(p) (ClHighNum(p) * 0x100 + ClLowNum(p))
#define ClSetNum(p, n) (ClHighNum(p)=(u_char)((n) >> 8), ClLowNum(p)=(u_char)(n)) #define ClSetNum(p, n) (ClHighNum(p) = (u_char)((n) >> 8), ClLowNum(p) = (u_char)(n))
#define ClYomiPos(p) ((p) + CL_YDATA) #define ClYomiPos(p) ((p) + CL_YDATA)
#define ClBlkLen(p) (ClYomiLen(p) + CL_HDLEN) #define ClBlkLen(p) (ClYomiLen(p) + CL_HDLEN)
#define ClNextTag(p) ((p) + ClBlkLen(p)) #define ClNextTag(p) ((p) + ClBlkLen(p))

29
include/sj3core/sj_suuji.h
View file

@ -33,16 +33,10 @@
* $SonyDate: 1994/06/03 08:01:19 $ * $SonyDate: 1994/06/03 08:01:19 $
*/ */
#ifndef _SJ_SUUJI #ifndef _SJ_SUUJI
#define _SJ_SUUJI #define _SJ_SUUJI
#define SJTBLRECLEN 6 #define SJTBLRECLEN 6
#define SJTBLRECNUM 34 #define SJTBLRECNUM 34
#define SjTblYPos(p) (p) #define SjTblYPos(p) (p)
@ -113,25 +107,16 @@
#define SELNUM0123 (JFLAG_N01 | JFLAG_N23) #define SELNUM0123 (JFLAG_N01 | JFLAG_N23)
#define SELNUM1_23_10_1 (JFLAG_N_1 | JFLAG_N23 | JFLAG_N10 | JFLAG_NS1) #define SELNUM1_23_10_1 (JFLAG_N_1 | JFLAG_N23 | JFLAG_N10 | JFLAG_NS1)
#define SELNUMMUST (JFLAG_NK2 | JFLAG_NK4 | JFLAG_NN0 | JFLAG_NSN) #define SELNUMMUST (JFLAG_NK2 | JFLAG_NK4 | JFLAG_NN0 | JFLAG_NSN)
#define SELNUMALL (JFLAG_N10 | JFLAG_N_1 | JFLAG_NS1 | JFLAG_N01 \ #define SELNUMALL (JFLAG_N10 | JFLAG_N_1 | JFLAG_NS1 | JFLAG_N01 | JFLAG_N23 | JFLAG_NK2 | JFLAG_NK4 | JFLAG_NN0 | JFLAG_NSN)
| JFLAG_N23 | JFLAG_NK2 | JFLAG_NK4 \
| JFLAG_NN0 | JFLAG_NSN)
#define SelNumFunc(c) ((c) & (~SELNUMALL)) #define SelNumFunc(c) ((c) & (~SELNUMALL))
#define SelNumCond(c) ((c) & SELNUMALL) #define SelNumCond(c) ((c) & SELNUMALL)
#define NUMBER123456789NS ((1 << _NUM1) | (1 << _NUM2) | (1 << _NUM3) | (1 << _NUM4) | (1 << _NUM5) | (1 << _NUM6) | (1 << _NUM7) | (1 << _NUM8) | (1 << _NUM9) | (1 << _NUM1S) | (1 << _NUMN) | (1 << _NUMS))
#define NUMBER0 (1 << _NUM0)
#define NUMBER123456789NS ((1<<_NUM1)|(1<<_NUM2)|(1<<_NUM3)|(1<<_NUM4) \ #define NUMBER1 ((1 << _NUM1) | (1 << _NUM1S))
|(1<<_NUM5)|(1<<_NUM6)|(1<<_NUM7)|(1<<_NUM8) \ #define NUMBERS1 (1 << _NUM1S)
|(1<<_NUM9)|(1<<_NUM1S)\ #define NUMBER01 (NUMBER0 | NUMBER1)
|(1<<_NUMN)|(1<<_NUMS)) #define NUMBER23 ((1 << _NUM2) | (1 << _NUM3))
#define NUMBER0 (1<<_NUM0)
#define NUMBER1 ((1<<_NUM1)|(1<<_NUM1S))
#define NUMBERS1 (1<<_NUM1S)
#define NUMBER01 (NUMBER0|NUMBER1)
#define NUMBER23 ((1<<_NUM2)|(1<<_NUM3))
#endif #endif

24
include/sj3core/sj_table.h
View file

@ -37,58 +37,40 @@
#define _SJ_TABLE #define _SJ_TABLE
#define isdpnd(c) (Chrtbl[c] & DEPEND) #define isdpnd(c) (Chrtbl[c] & DEPEND)
#define CnjAskLen(p) (((unsigned int)*(p) & 0x70) >> 4)
#define CnjAskLen(p) (((unsigned int) *(p) & 0x70) >> 4)
#define CnjNkrLen(p) (*(p) & 0x0f) #define CnjNkrLen(p) (*(p) & 0x0f)
#define CnjRight(p) *(p + CnjNkrLen(p) + 1) #define CnjRight(p) *(p + CnjNkrLen(p) + 1)
#define CnjRecLen(p) (CnjNkrLen(p) + 2) #define CnjRecLen(p) (CnjNkrLen(p) + 2)
#define FzkAskLen(p) ((unsigned int)*(p) >> 5)
#define FzkAskLen(p) ((unsigned int) *(p) >> 5)
#define FzkNkrLen(p) (*(p) & 0x07) #define FzkNkrLen(p) (*(p) & 0x07)
#define FzkStrKa(p) (((unsigned int)*(p) >> 3) & 1)
#define FzkStrKa(p) (((unsigned int) *(p) >> 3) & 1)
#define FzkHasCode(p) (*(p) & 0x10) #define FzkHasCode(p) (*(p) & 0x10)
#define FzkLeft(p) (*((p) + nlen + 1)) #define FzkLeft(p) (*((p) + nlen + 1))
#define FzkRight(p) (*((p) + nlen + 2)) #define FzkRight(p) (*((p) + nlen + 2))
#define SttYomiLen(p) (*(p) & 0x0f) #define SttYomiLen(p) (*(p) & 0x0f)
#define SttHiraKnj(p) (*(p) & 0x80) #define SttHiraKnj(p) (*(p) & 0x80)
#define StbKnjLen(p) (*(p) & 0x07) #define StbKnjLen(p) (*(p) & 0x07)
#define StbYomiLen(p) (*(p) >> 4) #define StbYomiLen(p) (*(p) >> 4)
#define StbYomiTop(p) ((p) + 2) #define StbYomiTop(p) ((p) + 2)
#define StbBakeru(p) (*(p) & 0x08) #define StbBakeru(p) (*(p) & 0x08)
#define StbHinsi(p) (*((p) + 1)) #define StbHinsi(p) (*((p) + 1))
#define Charsize charsize #define Charsize charsize

5
include/sj3core/sj_typedef.h
View file

@ -40,16 +40,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#define RECURS #define RECURS
typedef unsigned char u_char; typedef unsigned char u_char;
typedef unsigned short u_short; typedef unsigned short u_short;
typedef unsigned int u_int; typedef unsigned int u_int;
typedef void (*VFunc)(); typedef void (*VFunc)();
typedef u_char *(*UCPFunc)(); typedef u_char* (*UCPFunc)();
typedef int (*IFunc)(); typedef int (*IFunc)();
typedef u_char TypeGroup; typedef u_char TypeGroup;
@ -64,4 +62,3 @@ typedef u_char TypeClass;
typedef u_char TypeBunNum; typedef u_char TypeBunNum;
#endif #endif

4
include/sj3core/sj_yomi.h
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:01:24 $ * $SonyDate: 1994/06/03 08:01:24 $
*/ */
#ifndef _SJ_YOMICODE #ifndef _SJ_YOMICODE
#define _SJ_YOMICODE #define _SJ_YOMICODE

7
include/sj3rkcv/kana.h
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:03:45 $ * $SonyDate: 1994/06/03 08:03:45 $
*/ */
#define ZKATA1 0xa5 #define ZKATA1 0xa5
#define ZHIRA1 0xa4 #define ZHIRA1 0xa4
#define ZKATAF2 0xa1 #define ZKATAF2 0xa1
@ -45,9 +42,7 @@
#define ZKATAMU 0xe0 #define ZKATAMU 0xe0
#define ZHIRAMU 0xe0 #define ZHIRAMU 0xe0
#define ZKATAn (ZKATAE2-ZKATAF2+1) #define ZKATAn (ZKATAE2 - ZKATAF2 + 1)
#define ZEN_SPACE 0xa1a1 #define ZEN_SPACE 0xa1a1
#define ZEN_KTEN 0xa1a3 #define ZEN_KTEN 0xa1a3

3
include/sj3rkcv/kctype.h
View file

@ -33,8 +33,6 @@
* $SonyDate: 1994/06/03 08:03:46 $ * $SonyDate: 1994/06/03 08:03:46 $
*/ */
#if !defined(__sony_news) || (defined(__sony_news) && !defined(SVR4)) #if !defined(__sony_news) || (defined(__sony_news) && !defined(SVR4))
#ifndef __KCTYPE #ifndef __KCTYPE
#define __KCTYPE #define __KCTYPE
@ -112,4 +110,3 @@
#define iskana iskana2 #define iskana iskana2
#endif #endif
#endif #endif

7
include/sj3rkcv/key.h
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:03:47 $ * $SonyDate: 1994/06/03 08:03:47 $
*/ */
#define KEY_NORMAL 0 #define KEY_NORMAL 0
#define KEY_CONV 1 #define KEY_CONV 1
#define KEY_HENKAN 2 #define KEY_HENKAN 2
@ -90,9 +86,6 @@
#define KEY_MORE 43 #define KEY_MORE 43
#define UKEYNUM 64 #define UKEYNUM 64
#define SEQLEN 8 #define SEQLEN 8
#define COMNUM 64 #define COMNUM 64

17
include/sj3rkcv/rk.h
View file

@ -68,18 +68,17 @@
#define GetMojilen(c) ((c & ERRCODE) ? (1) : ((c >> 16) & 0xff)) #define GetMojilen(c) ((c & ERRCODE) ? (1) : ((c >> 16) & 0xff))
typedef struct rktable_w16 { typedef struct rktable_w16 {
wchar16_t *r_key; wchar16_t* r_key;
u_short *k_yomi; u_short* k_yomi;
wchar16_t *r_str; wchar16_t* r_str;
struct rktable_w16 *next; struct rktable_w16* next;
} RkTablW16; } RkTablW16;
typedef struct rktable { typedef struct rktable {
u_char *r_key; u_char* r_key;
u_short *k_yomi; u_short* k_yomi;
u_char *r_str; u_char* r_str;
struct rktable *next; struct rktable* next;
} RkTabl; } RkTabl;
#endif /* RK_H */ #endif /* RK_H */

109
include/sj3rkcv/sj3rkcv.h
View file

@ -23,58 +23,58 @@
#define RKSIZE 256 #define RKSIZE 256
#define RKINCZ 32 #define RKINCZ 32
typedef struct rkbufrec { typedef struct rkbufrec {
RkTablW16 *rkbuf; RkTablW16* rkbuf;
RkTablW16 *rkend; RkTablW16* rkend;
struct rkbufrec *rkbufp; struct rkbufrec* rkbufp;
} RkbufRec; } RkbufRec;
#define STRSIZE 1024 #define STRSIZE 1024
#define STRINCZ 256 #define STRINCZ 256
typedef struct strbufrec { typedef struct strbufrec {
wchar16_t *strbuf; wchar16_t* strbuf;
wchar16_t *strend; wchar16_t* strend;
struct strbufrec *strbufp; struct strbufrec* strbufp;
} StrbufRec; } StrbufRec;
#define YMISIZE 512 #define YMISIZE 512
#define YMIINCZ 64 #define YMIINCZ 64
typedef struct ymibufrec { typedef struct ymibufrec {
wchar16_t *ymibuf; wchar16_t* ymibuf;
wchar16_t *ymiend; wchar16_t* ymiend;
struct ymibufrec *ymibufp; struct ymibufrec* ymibufp;
} YmibufRec; } YmibufRec;
extern RkTabl *sj3_rcode[MAXCODE]; extern RkTabl* sj3_rcode[MAXCODE];
extern RkTablW16 *sj3_rcode_w16[MAXCODE]; extern RkTablW16* sj3_rcode_w16[MAXCODE];
extern RkTablW16 *rktblp; extern RkTablW16* rktblp;
extern wchar16_t rline[MAXLLEN]; extern wchar16_t rline[MAXLLEN];
extern wchar16_t lstr[MAXLLEN]; extern wchar16_t lstr[MAXLLEN];
void sj3_rkcode(int); void sj3_rkcode(int);
int sj3_rkinit2(char *, int); int sj3_rkinit2(char*, int);
int rcode_sjis_init(); int rcode_sjis_init();
int rcode_euc_init(); int rcode_euc_init();
int sj3_rkinit(char *); int sj3_rkinit(char*);
int sj3_rkinit_euc(char *); int sj3_rkinit_euc(char*);
int sj3_rkinit_mb(char *); int sj3_rkinit_mb(char*);
int sj3_rkinit_sub(char *rkfile, int (*)()); int sj3_rkinit_sub(char* rkfile, int (*)());
char *rkgetyomi(char *, wchar16_t *, int *); char* rkgetyomi(char*, wchar16_t*, int*);
char *getkey(char *, wchar16_t *, int *); char* getkey(char*, wchar16_t*, int*);
void cltable(); void cltable();
int chk_rstr(wchar16_t *, wchar16_t *, int, int); int chk_rstr(wchar16_t*, wchar16_t*, int, int);
RkTablW16 *rkalloc(); RkTablW16* rkalloc();
int stradd(wchar16_t **, wchar16_t *, int); int stradd(wchar16_t**, wchar16_t*, int);
int kstradd(wchar16_t **, wchar16_t *, int); int kstradd(wchar16_t**, wchar16_t*, int);
RkTablW16 * mktable(wchar16_t *, int); RkTablW16* mktable(wchar16_t*, int);
void sj3_rkebell(int); void sj3_rkebell(int);
void sj3_rkclear(); void sj3_rkclear();
void sj3_rkreset(); void sj3_rkreset();
void sj3_rkconvc(wchar16_t, u_int *); void sj3_rkconvc(wchar16_t, u_int*);
int sj3_rkconv2(wchar16_t *, u_int *, int); int sj3_rkconv2(wchar16_t*, u_int*, int);
int sj3_rkconv(u_char *, u_char *); int sj3_rkconv(u_char*, u_char*);
int sj3_rkconv_euc(u_char *, u_char *); int sj3_rkconv_euc(u_char*, u_char*);
int sj3_rkconv_mb(u_char *, u_char *); int sj3_rkconv_mb(u_char*, u_char*);
int sj3_rkconv_w16(wchar16_t *, wchar16_t *); int sj3_rkconv_w16(wchar16_t*, wchar16_t*);
int rkmatch(wchar16_t *, wchar16_t *, int); int rkmatch(wchar16_t*, wchar16_t*, int);
/* sj3_rkcv.h */ /* sj3_rkcv.h */
#ifdef ADDHK #ifdef ADDHK
@ -83,45 +83,44 @@ void setl_hktozh();
void mkkigou(); void mkkigou();
int sj_addten(u_short, u_short); int sj_addten(u_short, u_short);
int sj_han2zen(u_short); int sj_han2zen(u_short);
int sj3_hantozen_euc(u_char *, u_char *); int sj3_hantozen_euc(u_char*, u_char*);
int sj3_hantozen_mb(u_char *, u_char *); int sj3_hantozen_mb(u_char*, u_char*);
int sj3_hantozen_w16(wchar16_t *, wchar16_t *); int sj3_hantozen_w16(wchar16_t*, wchar16_t*);
int sj_hantozen(wchar16_t *, wchar16_t *, int); int sj_hantozen(wchar16_t*, wchar16_t*, int);
int sj_zen2han(u_short); int sj_zen2han(u_short);
int sj3_zentohan(u_char *, u_char *); int sj3_zentohan(u_char*, u_char*);
int sj3_zentohan_euc(u_char *, u_char *); int sj3_zentohan_euc(u_char*, u_char*);
int sj3_zentohan_mb(u_char *, u_char *); int sj3_zentohan_mb(u_char*, u_char*);
int sj3_zentohan_w16(wchar16_t *, wchar16_t *); int sj3_zentohan_w16(wchar16_t*, wchar16_t*);
int sj_zentohan(wchar16_t *, wchar16_t *, int); int sj_zentohan(wchar16_t*, wchar16_t*, int);
int sj_tokata(wchar16_t); int sj_tokata(wchar16_t);
int sj_tohira(wchar16_t); int sj_tohira(wchar16_t);
int sj_htok(wchar16_t *, wchar16_t *); int sj_htok(wchar16_t*, wchar16_t*);
int sj_ktoh(wchar16_t *, wchar16_t *); int sj_ktoh(wchar16_t*, wchar16_t*);
/* wc16_str.c */ /* wc16_str.c */
int sj3_iswcntrl16(wchar16_t); int sj3_iswcntrl16(wchar16_t);
int sj3_iswupper16(wchar16_t); int sj3_iswupper16(wchar16_t);
int sj3_iswdigit16(wchar16_t); int sj3_iswdigit16(wchar16_t);
int sj3_iswxdigit16(wchar16_t); int sj3_iswxdigit16(wchar16_t);
int sj3_wslen16(wchar16_t *); int sj3_wslen16(wchar16_t*);
int sj3_wscmp16(wchar16_t *, wchar16_t *); int sj3_wscmp16(wchar16_t*, wchar16_t*);
int sj3_wsncmp16(wchar16_t *, wchar16_t *, int); int sj3_wsncmp16(wchar16_t*, wchar16_t*, int);
wchar16_t *sj3_wscpy16(wchar16_t *, wchar16_t *); wchar16_t* sj3_wscpy16(wchar16_t*, wchar16_t*);
wchar16_t *sj3_wsncpy16(wchar16_t *, wchar16_t *, int); wchar16_t* sj3_wsncpy16(wchar16_t*, wchar16_t*, int);
wchar16_t *sj3_wscat16(wchar16_t *, wchar16_t *); wchar16_t* sj3_wscat16(wchar16_t*, wchar16_t*);
wchar16_t sj3_euc2wc16(unsigned int); wchar16_t sj3_euc2wc16(unsigned int);
wchar16_t sj3_sjis2wc16(unsigned int); wchar16_t sj3_sjis2wc16(unsigned int);
unsigned int sj3_wc2euc16(wchar16_t); unsigned int sj3_wc2euc16(wchar16_t);
unsigned int sj3_wc2sjis16(wchar16_t); unsigned int sj3_wc2sjis16(wchar16_t);
int sj3_wcs2eucs16(unsigned char *, wchar16_t *, int); int sj3_wcs2eucs16(unsigned char*, wchar16_t*, int);
int sj3_wcs2sjiss16(unsigned char *, wchar16_t *, int); int sj3_wcs2sjiss16(unsigned char*, wchar16_t*, int);
int sj3_eucs2wcs16(wchar16_t *, unsigned char *, int); int sj3_eucs2wcs16(wchar16_t*, unsigned char*, int);
int sj3_sjiss2wcs16(wchar16_t *, unsigned char *, int); int sj3_sjiss2wcs16(wchar16_t*, unsigned char*, int);
int sj3_mbstowcs16(wchar16_t *, unsigned char *, int); int sj3_mbstowcs16(wchar16_t*, unsigned char*, int);
int sj3_wcstombs16(unsigned char *, unsigned char *, int); int sj3_wcstombs16(unsigned char*, unsigned char*, int);
/* XXX */ /* XXX */
extern int current_locale; extern int current_locale;
#endif #endif

49
include/sj3rkcv/wchar16.h
View file

@ -33,12 +33,9 @@
* $SonyDate: 1994/06/03 08:03:52 $ * $SonyDate: 1994/06/03 08:03:52 $
*/ */
#ifndef _WCHARH #ifndef _WCHARH
#define _WCHARH #define _WCHARH
#if defined(__sony_news) && defined(SVR4) #if defined(__sony_news) && defined(SVR4)
#define _WCHAR_T #define _WCHAR_T
typedef unsigned short wchar_t; typedef unsigned short wchar_t;
@ -111,14 +108,10 @@ typedef unsigned short wchar16_t;
#define wcstombs(ws, mb, n) sj3_wcstombs16(ws, mb, n) #define wcstombs(ws, mb, n) sj3_wcstombs16(ws, mb, n)
#endif #endif
#define LC_CTYPE_SHIFTJIS 1 #define LC_CTYPE_SHIFTJIS 1
#define LC_CTYPE_EUC 2 #define LC_CTYPE_EUC 2
#define IsEUCHojo(x) (((unsigned char) (x)) == SS3) #define IsEUCHojo(x) (((unsigned char)(x)) == SS3)
#define WcX0208MASK 0xffff #define WcX0208MASK 0xffff
#define WcX0212MASK 0xff7f #define WcX0212MASK 0xff7f
@ -134,13 +127,13 @@ typedef unsigned short wchar16_t;
#define WcLowByte(w) ((w) & 0xff) #define WcLowByte(w) ((w) & 0xff)
#define WcHighByte(w) (((w) >> 8) & 0xff) #define WcHighByte(w) (((w) >> 8) & 0xff)
#define WcIsASCII(w) ((((wchar16_t) (w)) & WcX0208FLAG) == WcASCIIFLAG) #define WcIsASCII(w) ((((wchar16_t)(w)) & WcX0208FLAG) == WcASCIIFLAG)
#define WcIsX0208(w) ((((wchar16_t) (w)) & WcX0208FLAG) == WcX0208FLAG) #define WcIsX0208(w) ((((wchar16_t)(w)) & WcX0208FLAG) == WcX0208FLAG)
#define WcIsX0201(w) ((((wchar16_t) (w)) & WcX0208FLAG) == WcX0201FLAG) #define WcIsX0201(w) ((((wchar16_t)(w)) & WcX0208FLAG) == WcX0201FLAG)
#define WcIsX0212(w) ((((wchar16_t) (w)) & WcX0208FLAG) == WcX0212FLAG) #define WcIsX0212(w) ((((wchar16_t)(w)) & WcX0208FLAG) == WcX0212FLAG)
#define WcIsZENKAKU(w) ((((wchar16_t) (w)) & WcX0212FLAG) == WcX0212FLAG) #define WcIsZENKAKU(w) ((((wchar16_t)(w)) & WcX0212FLAG) == WcX0212FLAG)
#define WcIsHANKAKU(w) ((((wchar16_t) (w)) & WcX0212FLAG) == WcASCIIFLAG) #define WcIsHANKAKU(w) ((((wchar16_t)(w)) & WcX0212FLAG) == WcASCIIFLAG)
#define WcIsKANJI(w) WcIsZENKAKU(w) #define WcIsKANJI(w) WcIsZENKAKU(w)
#define WcIsKANA(w) WcIsX0201(w) #define WcIsKANA(w) WcIsX0201(w)
@ -149,7 +142,6 @@ typedef unsigned short wchar16_t;
#define WcJIS2X0212(w) ((w) | WcX0212FLAG) #define WcJIS2X0212(w) ((w) | WcX0212FLAG)
#define Wc2JIS(w) ((w) & WcJISMASK) #define Wc2JIS(w) ((w) & WcJISMASK)
#define WCSJrun WcMessages[0] #define WCSJrun WcMessages[0]
#define WCMode_buff WcMessages[1] #define WCMode_buff WcMessages[1]
@ -168,8 +160,6 @@ typedef unsigned short wchar16_t;
#define WCGHelp WcMessages[11] #define WCGHelp WcMessages[11]
#define WCMHelp WcMessages[12] #define WCMHelp WcMessages[12]
#define WCGCshift WcMessages[13] #define WCGCshift WcMessages[13]
#define WCGCeuc WcMessages[14] #define WCGCeuc WcMessages[14]
#define WCGCeuc2 WcMessages[15] #define WCGCeuc2 WcMessages[15]
@ -178,8 +168,6 @@ typedef unsigned short wchar16_t;
#define WCGCkuten WcMessages[18] #define WCGCkuten WcMessages[18]
#define WCGCkuten2 WcMessages[19] #define WCGCkuten2 WcMessages[19]
#define WCGtoroku WcMessages[20] #define WCGtoroku WcMessages[20]
#define WCMhani WcMessages[21] #define WCMhani WcMessages[21]
#define WCMyomi WcMessages[22] #define WCMyomi WcMessages[22]
@ -199,7 +187,6 @@ typedef unsigned short wchar16_t;
#define WCSystemError WcMessages[36] #define WCSystemError WcMessages[36]
#define WCKanma WcMessages[37] #define WCKanma WcMessages[37]
#define WCGsyoukyo WcMessages[38] #define WCGsyoukyo WcMessages[38]
#define WCSYOUKYO_SUCC WcMessages[39] #define WCSYOUKYO_SUCC WcMessages[39]
#define WCNotExist WcMessages[40] #define WCNotExist WcMessages[40]
@ -208,17 +195,12 @@ typedef unsigned short wchar16_t;
#define WCKanjiShokyo WcMessages[43] #define WCKanjiShokyo WcMessages[43]
#define WCShokyoError WcMessages[44] #define WCShokyoError WcMessages[44]
#define WCSUCCsjrc WcMessages[45] #define WCSUCCsjrc WcMessages[45]
#define WCFAILsjrc WcMessages[46] #define WCFAILsjrc WcMessages[46]
#define WCNOTHsjrc WcMessages[47] #define WCNOTHsjrc WcMessages[47]
#define WCWeight_mes WcMessages[48] #define WCWeight_mes WcMessages[48]
#define WCGrcon WcMessages[49] #define WCGrcon WcMessages[49]
#define WCRserv WcMessages[50] #define WCRserv WcMessages[50]
#define WCRserv_OK WcMessages[51] #define WCRserv_OK WcMessages[51]
@ -228,7 +210,6 @@ typedef unsigned short wchar16_t;
#define WCSpace2 WcMessages[54] #define WCSpace2 WcMessages[54]
#define WCContinue WcMessages[55] #define WCContinue WcMessages[55]
#define WCServer_Dead WcMessages[56] #define WCServer_Dead WcMessages[56]
#define WCConnected WcMessages[57] #define WCConnected WcMessages[57]
#define WCNconnect WcMessages[58] #define WCNconnect WcMessages[58]
@ -239,26 +220,20 @@ typedef unsigned short wchar16_t;
#define WCNmake_Study WcMessages[63] #define WCNmake_Study WcMessages[63]
#define WCNopen_Study WcMessages[64] #define WCNopen_Study WcMessages[64]
#define WCGedit WcMessages[65] #define WCGedit WcMessages[65]
#define WCTooLong WcMessages[67] #define WCTooLong WcMessages[67]
#define WCDollar WcMessages[68] #define WCDollar WcMessages[68]
#define WCOn WcMessages[69] #define WCOn WcMessages[69]
#define WCOff WcMessages[70] #define WCOff WcMessages[70]
#define WCMeishi WcMessages[71] #define WCMeishi WcMessages[71]
#define WCMyouji WcMessages[72] #define WCMyouji WcMessages[72]
#define WCNamae WcMessages[73] #define WCNamae WcMessages[73]
#define WCTimei WcMessages[74] #define WCTimei WcMessages[74]
#define WCSahen WcMessages[75] #define WCSahen WcMessages[75]
#define WCKara WcMessages[76] #define WCKara WcMessages[76]
#define WCF1 WcMessages[77] #define WCF1 WcMessages[77]
#define WCF2 WcMessages[78] #define WCF2 WcMessages[78]
@ -324,7 +299,6 @@ typedef unsigned short wchar16_t;
#define WCReconnect WcMessages[137] #define WCReconnect WcMessages[137]
#define WCKill WcMessages[138] #define WCKill WcMessages[138]
#define WCKey WcMessages[139] #define WCKey WcMessages[139]
#define WCEscape WcMessages[140] #define WCEscape WcMessages[140]
#define WCSjxkey WcMessages[141] #define WCSjxkey WcMessages[141]
@ -374,18 +348,15 @@ typedef unsigned short wchar16_t;
#define WCUnbuffer WcMessages[180] #define WCUnbuffer WcMessages[180]
#define WCFuncetc WcMessages[181] #define WCFuncetc WcMessages[181]
extern wchar16_t *WcMessages[]; extern wchar16_t* WcMessages[];
struct wcvtkey { struct wcvtkey {
wchar16_t *key_word; wchar16_t* key_word;
wchar16_t key_seq[SEQLEN]; wchar16_t key_seq[SEQLEN];
}; };
struct functbl { struct functbl {
wchar16_t *keyword; wchar16_t* keyword;
int (*func)(); int (*func)();
}; };

253
lib/sj3core/adddic.c
View file

@ -36,23 +36,18 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static void sprt_seg(TypeDicSeg, TypeDicOfs); static void sprt_seg(TypeDicSeg, TypeDicOfs);
static void apnd_uidx(TypeDicSeg, u_char *, int); static void apnd_uidx(TypeDicSeg, u_char*, int);
static int cal_nextym(u_char *); static int cal_nextym(u_char*);
static int usr_freelen(); static int usr_freelen();
static u_int checkdict(u_char *, TypeGram); static u_int checkdict(u_char*, TypeGram);
u_int adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) {
u_int
adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
{
u_int err; u_int err;
u_char yptr[MAXWDYOMILEN + 1]; u_char yptr[MAXWDYOMILEN + 1];
u_char kptr[MAXWDKANJILEN + 1]; u_char kptr[MAXWDKANJILEN + 1];
@ -68,51 +63,51 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
TypeDicOfs oldsiz; TypeDicOfs oldsiz;
TypeDicOfs fresiz; TypeDicOfs fresiz;
TypeIdxOfs freidx; TypeIdxOfs freidx;
u_char *douptr; u_char* douptr;
u_char *dstptr; u_char* dstptr;
TypeDicOfs pos; TypeDicOfs pos;
u_char *p1; u_char* p1;
int i; int i;
int nlen, plen; int nlen, plen;
int size; int size;
STDYIN *stdy; STDYIN* stdy;
STDYOUT stdydat; STDYOUT stdydat;
if (err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))) if(err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr)))
return err; return err;
inputyomi = yomi; inputyomi = yomi;
cnvstart = ystart = yptr; cnvstart = ystart = yptr;
cnvlen = sstrlen(yptr); cnvlen = sstrlen(yptr);
if (err = checkdict(kanji, hinsi)) if(err = checkdict(kanji, hinsi))
return err; return err;
if (!curdict -> maxunit) if(!curdict->maxunit)
return AD_NOTUSERDICT; return AD_NOTUSERDICT;
klen = cvtknj(yomi, kanji, kptr); klen = cvtknj(yomi, kanji, kptr);
newsiz = DOUONBLKSIZENUMBER + cnvlen + (klen !=0 ? klen+1 : 0) + 2; newsiz = DOUONBLKSIZENUMBER + cnvlen + (klen != 0 ? klen + 1 : 0) + 2;
if (newsiz > MAXDOUONBLK) if(newsiz > MAXDOUONBLK)
return AD_OVFLWDOUBLK; return AD_OVFLWDOUBLK;
if (newsiz > curdict->seglen) if(newsiz > curdict->seglen)
return AD_OVFLWDOUBLK; return AD_OVFLWDOUBLK;
segnum = srchidx((TypeDicSeg)DICSEGBASE, cnvlen); segnum = srchidx((TypeDicSeg)DICSEGBASE, cnvlen);
for ( ; ; ) { for(;;) {
(*curdict->getdic)(curdict, segnum); (*curdict->getdic)(curdict, segnum);
i = srchkana(&p1, &saml); i = srchkana(&p1, &saml);
dstofs = douofs = p1 - dicbuf; dstofs = douofs = p1 - dicbuf;
hnsofs = knjofs = 0; hnsofs = knjofs = 0;
if (i) { if(i) {
i = srchgram(p1, &p1, hinsi); i = srchgram(p1, &p1, hinsi);
dstofs = hnsofs = p1 - dicbuf; dstofs = hnsofs = p1 - dicbuf;
if (i) { if(i) {
srchkanji(&p1, kptr, klen); srchkanji(&p1, kptr, klen);
if (*p1 != HINSIBLKTERM) if(*p1 != HINSIBLKTERM)
return AD_AREXIST; return AD_AREXIST;
dstofs = knjofs = p1 - dicbuf; dstofs = knjofs = p1 - dicbuf;
} }
@ -120,46 +115,45 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
p1 = dicbuf + douofs; p1 = dicbuf + douofs;
if (!hnsofs) { if(!hnsofs) {
oldsiz = 0; oldsiz = 0;
nlen = cnvlen - saml; nlen = cnvlen - saml;
newsiz = DOUONBLKSIZENUMBER + nlen; newsiz = DOUONBLKSIZENUMBER + nlen;
nxtask = cal_nextym(p1); nxtask = cal_nextym(p1);
} } else {
else {
oldsiz = newsiz = getsize(p1); oldsiz = newsiz = getsize(p1);
nxtask = 0; nxtask = 0;
} }
if (!knjofs) newsiz += 2; if(!knjofs) newsiz += 2;
newsiz += (klen != 0 ? klen+1 : 0); newsiz += (klen != 0 ? klen + 1 : 0);
fresiz = usr_freelen(); fresiz = usr_freelen();
if ((unsigned int) (newsiz - oldsiz - nxtask) <= if((unsigned int)(newsiz - oldsiz - nxtask) <=
(unsigned int) fresiz) break; (unsigned int)fresiz) break;
if (segend(p1) && (segnum + 1 < curdict->segunit)) { if(segend(p1) && (segnum + 1 < curdict->segunit)) {
segnum++; segnum++;
continue; continue;
} }
if (curdict->segunit >= curdict->maxunit) if(curdict->segunit >= curdict->maxunit)
return AD_OVFLWUSRDIC; return AD_OVFLWUSRDIC;
freidx = count_uidx(); freidx = count_uidx();
if ((unsigned int) (douofs + newsiz) <= curdict->seglen) { if((unsigned int)(douofs + newsiz) <= curdict->seglen) {
if (hnsofs) if(hnsofs)
p1 = getntag(p1); p1 = getntag(p1);
pos = p1 - dicbuf; pos = p1 - dicbuf;
nlen = getnlen(p1); nlen = getnlen(p1);
if ((unsigned int) freidx < getplen(p1) + nlen + 1) if((unsigned int)freidx < getplen(p1) + nlen + 1)
return AD_OVFLWINDEX; return AD_OVFLWINDEX;
if ((*curdict->putdic)(curdict, curdict->segunit)) if((*curdict->putdic)(curdict, curdict->segunit))
return AD_OVFLWUSRDIC; return AD_OVFLWUSRDIC;
sprt_seg(segnum, pos); sprt_seg(segnum, pos);
@ -168,11 +162,11 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
break; break;
} }
if (segend(p1)) { if(segend(p1)) {
if ((unsigned int) freidx < cnvlen + 1) if((unsigned int)freidx < cnvlen + 1)
return AD_OVFLWINDEX; return AD_OVFLWINDEX;
if ((*curdict->putdic)(curdict, curdict->segunit)) if((*curdict->putdic)(curdict, curdict->segunit))
return AD_OVFLWUSRDIC; return AD_OVFLWUSRDIC;
curdict->segunit++; curdict->segunit++;
@ -184,13 +178,12 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
mkidxtbl(curdict); mkidxtbl(curdict);
segnum++; segnum++;
} } else {
else {
nlen = getnlen(p1); nlen = getnlen(p1);
if ((unsigned int) freidx < getplen(p1) + nlen + 1) if((unsigned int)freidx < getplen(p1) + nlen + 1)
return AD_OVFLWINDEX; return AD_OVFLWINDEX;
if ((*curdict->putdic)(curdict, curdict->segunit)) if((*curdict->putdic)(curdict, curdict->segunit))
return AD_OVFLWUSRDIC; return AD_OVFLWUSRDIC;
sprt_seg(segnum, douofs); sprt_seg(segnum, douofs);
@ -201,16 +194,16 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
douptr = dicbuf + douofs; douptr = dicbuf + douofs;
if (nxtask) { if(nxtask) {
u_char *tp; u_char* tp;
size = getsize(douptr) - nxtask; size = getsize(douptr) - nxtask;
plen = getplen(douptr) + nxtask; plen = getplen(douptr) + nxtask;
nlen = getnlen(douptr) - nxtask; nlen = getnlen(douptr) - nxtask;
*douptr = (size >> 8); *douptr = (size >> 8);
if (nlen & 0x10) if(nlen & 0x10)
*douptr |= NOKORIYOMITOP; *douptr |= NOKORIYOMITOP;
if (plen & 0x10) if(plen & 0x10)
*douptr |= ASSYUKUYOMITOP; *douptr |= ASSYUKUYOMITOP;
*(douptr + 1) = size; *(douptr + 1) = size;
*(douptr + 2) = ((nlen & 0x0f) | ((plen & 0x0f) << 4)); *(douptr + 2) = ((nlen & 0x0f) | ((plen & 0x0f) << 4));
@ -225,69 +218,68 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
p1 = dicbuf + curdict->seglen; p1 = dicbuf + curdict->seglen;
mvmemd(p1 - size, p1, p1 - dstptr - size); mvmemd(p1 - size, p1, p1 - dstptr - size);
if (!hnsofs) { if(!hnsofs) {
if (douofs == segtop() - dicbuf) { if(douofs == segtop() - dicbuf) {
chg_uidx(segnum, yptr, cnvlen); chg_uidx(segnum, yptr, cnvlen);
} }
*dstptr = 0; *dstptr = 0;
nlen = cnvlen - saml; nlen = cnvlen - saml;
if (nlen & 0x10) if(nlen & 0x10)
*dstptr |= NOKORIYOMITOP; *dstptr |= NOKORIYOMITOP;
if (saml & 0x10) if(saml & 0x10)
*dstptr |= ASSYUKUYOMITOP; *dstptr |= ASSYUKUYOMITOP;
*dstptr++ |= (size >> 8); *dstptr++ |= (size >> 8);
*dstptr++ = size; *dstptr++ = size;
*dstptr++ = ((nlen&0x0f)|((saml&0x0f)<<4)); *dstptr++ = ((nlen & 0x0f) | ((saml & 0x0f) << 4));
while (saml < cnvlen) *dstptr++ = yptr[saml++]; while(saml < cnvlen) *dstptr++ = yptr[saml++];
} } else {
else {
plen = getplen(douptr); plen = getplen(douptr);
nlen = getnlen(douptr); nlen = getnlen(douptr);
*douptr = (newsiz >> 8); *douptr = (newsiz >> 8);
if (nlen & 0x10) if(nlen & 0x10)
*douptr |= NOKORIYOMITOP; *douptr |= NOKORIYOMITOP;
if (plen & 0x10) if(plen & 0x10)
*douptr |= ASSYUKUYOMITOP; *douptr |= ASSYUKUYOMITOP;
*(douptr + 1) = newsiz; *(douptr + 1) = newsiz;
*(douptr + 2) = ((nlen & 0x0f) | ((plen & 0x0f) << 4)); *(douptr + 2) = ((nlen & 0x0f) | ((plen & 0x0f) << 4));
} }
if (!knjofs) if(!knjofs)
*dstptr++ = hinsi; *dstptr++ = hinsi;
stdydat.stdy1.offset = dstptr - dicbuf; stdydat.stdy1.offset = dstptr - dicbuf;
for (saml = 0 ; saml < klen ; ) for(saml = 0; saml < klen;)
*dstptr++ = kptr[saml++]; *dstptr++ = kptr[saml++];
if (klen > 0) if(klen > 0)
*dstptr++ = KANJISTREND; *dstptr++ = KANJISTREND;
if (!knjofs) if(!knjofs)
*dstptr++ = HINSIBLKTERM; *dstptr++ = HINSIBLKTERM;
(*curdict->putdic)(curdict, segnum); (*curdict->putdic)(curdict, segnum);
if (StudyExist()) { if(StudyExist()) {
size -= nxtask; size -= nxtask;
for (i = STUDYCOUNT, stdy = STUDYDICT ; i-- ; stdy++) { for(i = STUDYCOUNT, stdy = STUDYDICT; i--; stdy++) {
if (stdy -> dicid != curdict->dicid) if(stdy->dicid != curdict->dicid)
continue; continue;
if (stdy -> seg != segnum) if(stdy->seg != segnum)
continue; continue;
if (stdy -> offset >= dstofs) if(stdy->offset >= dstofs)
stdy -> offset += size; stdy->offset += size;
} }
for (p1 = CLSTUDYDICT ; !iseocl(p1) ; p1 = ClNextTag(p1)) { for(p1 = CLSTUDYDICT; !iseocl(p1); p1 = ClNextTag(p1)) {
err = sstrncmp(yptr, (u_char *)ClYomiPos(p1), err = sstrncmp(yptr, (u_char*)ClYomiPos(p1),
(int)ClYomiLen(p1)); (int)ClYomiLen(p1));
if (err == MATCH) { if(err == MATCH) {
delclsub(p1); delclsub(p1);
mkclidx(); mkclidx();
putcldic(); putcldic();
break; break;
} else if (err == OVER) } else if(err == OVER)
break; break;
} }
} }
@ -308,14 +300,11 @@ adddic(u_char *yomi, u_char *kanji, TypeGram hinsi)
return AD_DONE; return AD_DONE;
} }
static int static int
checksub(u_char *kanji, TypeGram grm) checksub(u_char* kanji, TypeGram grm) {
{ u_char* tagp;
u_char *tagp; u_char* ptr;
u_char *ptr; u_char* endp;
u_char *endp;
int flg, nlen; int flg, nlen;
int dounum; int dounum;
u_char buf[MAXWDKANJILEN + 1]; u_char buf[MAXWDKANJILEN + 1];
@ -323,10 +312,10 @@ checksub(u_char *kanji, TypeGram grm)
dicinl = cnvlen; dicinl = cnvlen;
dicsaml = 0; dicsaml = 0;
prevseg = (TypeDicSeg)-1; prevseg = (TypeDicSeg)-1;
for (;;) { for(;;) {
if (!(tagp = srchdict(tagp))) if(!(tagp = srchdict(tagp)))
return 0; return 0;
if (cnvlen == getnlen(tagp) + getplen(tagp)) if(cnvlen == getnlen(tagp) + getplen(tagp))
break; break;
} }
@ -337,12 +326,12 @@ checksub(u_char *kanji, TypeGram grm)
endp = tagp + getsize(tagp); endp = tagp + getsize(tagp);
while (ptr < endp) { while(ptr < endp) {
flg = (grm == *ptr++); flg = (grm == *ptr++);
while (*ptr != HINSIBLKTERM) { while(*ptr != HINSIBLKTERM) {
if (flg) { if(flg) {
buf[getkanji(inputyomi, cnvlen, ptr, buf)] = 0; buf[getkanji(inputyomi, cnvlen, ptr, buf)] = 0;
if (cmpstr(kanji, buf)) if(cmpstr(kanji, buf))
return -1; return -1;
} }
dounum++; dounum++;
@ -355,22 +344,19 @@ checksub(u_char *kanji, TypeGram grm)
return dounum; return dounum;
} }
static u_int static u_int
checkdict(u_char *kanji, TypeGram grm) checkdict(u_char* kanji, TypeGram grm) {
{ DICTL* dp;
DICTL *dp;
int dounum = 0; int dounum = 0;
int tmp; int tmp;
DICT *tmpdict; DICT* tmpdict;
tmpdict = curdict; tmpdict = curdict;
for (dp = dictlist ; dp ; dp = dp -> next) { for(dp = dictlist; dp; dp = dp->next) {
curdict = dp -> dict; curdict = dp->dict;
if ((tmp = checksub(kanji, grm)) < 0) { if((tmp = checksub(kanji, grm)) < 0) {
curdict = tmpdict; curdict = tmpdict;
return AD_AREXIST; return AD_AREXIST;
} }
@ -379,29 +365,26 @@ checkdict(u_char *kanji, TypeGram grm)
} }
curdict = tmpdict; curdict = tmpdict;
if (MAXKOUHONUMBER <= dounum) if(MAXKOUHONUMBER <= dounum)
return AD_OVFLWDOUNUM; return AD_OVFLWDOUNUM;
return 0; return 0;
} }
static int static int
cal_nextym(u_char *ptr) cal_nextym(u_char* ptr) {
{
int count = 0; int count = 0;
u_char *src; u_char* src;
int len; int len;
if (!segend(ptr)) { if(!segend(ptr)) {
src = cnvstart + getplen(ptr); src = cnvstart + getplen(ptr);
len = getnlen(ptr); len = getnlen(ptr);
ptr += DOUONBLKSIZENUMBER; ptr += DOUONBLKSIZENUMBER;
while (len--) { while(len--) {
if (*ptr++ == *src++) if(*ptr++ == *src++)
count++; count++;
else else
break; break;
@ -410,37 +393,31 @@ cal_nextym(u_char *ptr)
return count; return count;
} }
static int static int
usr_freelen() usr_freelen() {
{ u_char* ptr;
u_char *ptr;
ptr = segtop(); ptr = segtop();
while (!segend(ptr)) while(!segend(ptr))
ptr += getsize(ptr); ptr += getsize(ptr);
return curdict->seglen - (ptr - dicbuf); return curdict->seglen - (ptr - dicbuf);
} }
static void static void
sprt_seg(TypeDicSeg seg, TypeDicOfs ofs) sprt_seg(TypeDicSeg seg, TypeDicOfs ofs) {
{
TypeDicSeg s; TypeDicSeg s;
u_char *pos; u_char* pos;
u_char *p; u_char* p;
u_char *q; u_char* q;
int i; int i;
int j; int j;
int ylen, nlen; int ylen, nlen;
TypeDicID dicid; TypeDicID dicid;
u_char yomi[MAXWDYOMILEN]; u_char yomi[MAXWDYOMILEN];
STDYIN *stdy; STDYIN* stdy;
for (s = curdict->segunit - 1 ; s >= seg ; s--) { for(s = curdict->segunit - 1; s >= seg; s--) {
(*curdict->getdic)(curdict, s); (*curdict->getdic)(curdict, s);
(*curdict->putdic)(curdict, s + 1); (*curdict->putdic)(curdict, s + 1);
} }
@ -451,13 +428,13 @@ sprt_seg(TypeDicSeg seg, TypeDicOfs ofs)
pos = dicbuf + ofs; pos = dicbuf + ofs;
for (p = segtop() ; (p <= pos) && !segend(p) ; p = q) { for(p = segtop(); (p <= pos) && !segend(p); p = q) {
q = getntag(p); q = getntag(p);
i = getplen(p); i = getplen(p);
nlen = getnlen(p); nlen = getnlen(p);
j = (nlen != 0) ? nlen+1: 0; j = (nlen != 0) ? nlen + 1 : 0;
p += DOUONBLKSIZENUMBER; p += DOUONBLKSIZENUMBER;
while (j-- > 0) while(j-- > 0)
yomi[i++] = *p++; yomi[i++] = *p++;
} }
@ -480,18 +457,18 @@ sprt_seg(TypeDicSeg seg, TypeDicOfs ofs)
(*curdict->putdic)(curdict, seg + 1); (*curdict->putdic)(curdict, seg + 1);
if (StudyExist()) { if(StudyExist()) {
dicid = curdict -> dicid; dicid = curdict->dicid;
for (i = STUDYCOUNT, stdy = STUDYDICT ; i-- > 0 ; stdy++) { for(i = STUDYCOUNT, stdy = STUDYDICT; i-- > 0; stdy++) {
if (stdy -> dicid != dicid) if(stdy->dicid != dicid)
continue; continue;
else if (stdy -> seg < seg) else if(stdy->seg < seg)
continue; continue;
else if (stdy -> seg > seg) else if(stdy->seg > seg)
stdy -> seg += 1; stdy->seg += 1;
else if (stdy -> offset >= ofs) { else if(stdy->offset >= ofs) {
stdy -> seg += 1; stdy->seg += 1;
stdy -> offset -= j; stdy->offset -= j;
} }
} }
} }
@ -501,22 +478,18 @@ sprt_seg(TypeDicSeg seg, TypeDicOfs ofs)
(*curdict->putdic)(curdict, seg); (*curdict->putdic)(curdict, seg);
} }
static void static void
apnd_uidx(TypeDicSeg seg, u_char *yomi, int len) apnd_uidx(TypeDicSeg seg, u_char* yomi, int len) {
{ u_char* p;
u_char *p; u_char* q;
u_char *q;
p = get_idxptr(seg); p = get_idxptr(seg);
while (*p++) while(*p++);
;
q = idxbuf + curdict->idxlen; q = idxbuf + curdict->idxlen;
mvmemd(q - (len + 1), q, (int)(q - (len + 1) - p)); mvmemd(q - (len + 1), q, (int)(q - (len + 1) - p));
while (len--) while(len--)
*p++ = *yomi++; *p++ = *yomi++;
*p = 0; *p = 0;

231
lib/sj3core/addelcmn.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:01:27 $ * $SonyDate: 1994/06/03 08:01:27 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
@ -43,51 +40,44 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
void set_size(u_char* p, int size, int plen, int nlen) {
void
set_size(u_char *p, int size, int plen, int nlen)
{
*p = (u_char)(size >> 8); *p = (u_char)(size >> 8);
if (nlen & 0x10) *p |= NOKORIYOMITOP; if(nlen & 0x10) *p |= NOKORIYOMITOP;
if (plen & 0x10) *p |= ASSYUKUYOMITOP; if(plen & 0x10) *p |= ASSYUKUYOMITOP;
*(p + 1) = (u_char)size; *(p + 1) = (u_char)size;
*(p + 2) = (u_char)((nlen & 0x0f) | ((plen & 0x0f) << 4)); *(p + 2) = (u_char)((nlen & 0x0f) | ((plen & 0x0f) << 4));
} }
static int static int
isvyomi(u_char *yp) isvyomi(u_char* yp) {
{
int len; int len;
if (!*yp) return FALSE; if(!*yp) return FALSE;
if (!(Chrtbl[*yp] & DICTOP)) return FALSE; if(!(Chrtbl[*yp] & DICTOP)) return FALSE;
for (len = 0 ; *yp ; yp++) { for(len = 0; *yp; yp++) {
if (!(Chrtbl[*yp]) || (*yp >= Y_KUTEN)) return FALSE; if(!(Chrtbl[*yp]) || (*yp >= Y_KUTEN)) return FALSE;
if (++len > MAXWDYOMILEN) return FALSE; if(++len > MAXWDYOMILEN) return FALSE;
} }
return TRUE; return TRUE;
} }
static int static int
isvknj(u_char *kanji) isvknj(u_char* kanji) {
{
int len; int len;
if (!*kanji) return FALSE; if(!*kanji) return FALSE;
for (len = 0 ; *kanji ; ) { for(len = 0; *kanji;) {
if (*kanji == SS3) { if(*kanji == SS3) {
kanji += 3; kanji += 3;
len += 2; len += 2;
} else } else
if (isknj1(*kanji)) { if(isknj1(*kanji)) {
kanji += 2; kanji += 2;
len += 2; len += 2;
} }
@ -97,64 +87,54 @@ isvknj(u_char *kanji)
len += 2; len += 2;
} }
if (len > MAXWDKANJILEN) return FALSE; if(len > MAXWDKANJILEN) return FALSE;
} }
return TRUE; return TRUE;
} }
static int static int
isgrm(TypeGram gram) isgrm(TypeGram gram) {
{
int grm = gram; int grm = gram;
if (MEISI_1 <= grm && grm <= D_MEISI_6) return TRUE; if(MEISI_1 <= grm && grm <= D_MEISI_6) return TRUE;
if (MYOUJI <= grm && grm <= JOSUUSI2) return TRUE; if(MYOUJI <= grm && grm <= JOSUUSI2) return TRUE;
if (KEIYOUSI_1 <= grm && grm <= DO_ZAHEN) return TRUE; if(KEIYOUSI_1 <= grm && grm <= DO_ZAHEN) return TRUE;
if (DO_1DAN_1 <= grm && grm <= DO_WAGO_2) return TRUE; if(DO_1DAN_1 <= grm && grm <= DO_WAGO_2) return TRUE;
if (DO_KAGO_5 <= grm && grm <= DO_WAGO_5) return TRUE; if(DO_KAGO_5 <= grm && grm <= DO_WAGO_5) return TRUE;
if (DO_KAGO_6 <= grm && grm <= DO_WAGO_6) return TRUE; if(DO_KAGO_6 <= grm && grm <= DO_WAGO_6) return TRUE;
if (DO_1DAN_3 <= grm && grm <= DO_WAGO_3) return TRUE; if(DO_1DAN_3 <= grm && grm <= DO_WAGO_3) return TRUE;
if (DO_1DAN_4 <= grm && grm <= DO_WAGO_4) return TRUE; if(DO_1DAN_4 <= grm && grm <= DO_WAGO_4) return TRUE;
if (DO_KAGO_7 <= grm && grm <= DO_WAGO_7) return TRUE; if(DO_KAGO_7 <= grm && grm <= DO_WAGO_7) return TRUE;
if (DO_KAGO_8 <= grm && grm <= DO_WAGO_8) return TRUE; if(DO_KAGO_8 <= grm && grm <= DO_WAGO_8) return TRUE;
if (SP_SA_MI1 <= grm && grm <= TANKANJI) return TRUE; if(SP_SA_MI1 <= grm && grm <= TANKANJI) return TRUE;
return FALSE; return FALSE;
} }
u_int addel_arg(u_char* yp, u_char* kp, TypeGram grm, u_char* nyp, int len) {
u_int
addel_arg(u_char *yp, u_char *kp, TypeGram grm, u_char *nyp, int len)
{
u_short err = 0; u_short err = 0;
if (!sj2cd_str(yp, nyp, len)) err |= AD_BADYOMI; if(!sj2cd_str(yp, nyp, len)) err |= AD_BADYOMI;
if (!isvyomi(nyp)) err |= AD_BADYOMI; if(!isvyomi(nyp)) err |= AD_BADYOMI;
if (!isvknj(kp)) err |= AD_BADKANJI; if(!isvknj(kp)) err |= AD_BADKANJI;
if (!isgrm(grm)) err |= AD_BADHINSI; if(!isgrm(grm)) err |= AD_BADHINSI;
return err; return err;
} }
static void static void
yomi2kata(u_char *src, u_char *dst) yomi2kata(u_char* src, u_char* dst) {
{
int first; int first;
int second; int second;
while (first = *src++) { while(first = *src++) {
second = *src++; second = *src++;
if (first != 0xa4) { if(first != 0xa4) {
*dst++ = first; *dst++ = first;
*dst++ = second; *dst++ = second;
} }
@ -168,89 +148,78 @@ yomi2kata(u_char *src, u_char *dst)
*dst = 0; *dst = 0;
} }
static int static int
top_strcmp(u_char *src, u_char *dst) top_strcmp(u_char* src, u_char* dst) {
{
int i; int i;
for (i = 0 ; *src && (*src == *dst) ; src++, dst++) i++; for(i = 0; *src && (*src == *dst); src++, dst++) i++;
i /= 2; i /= 2;
return (i > MAXYOMIASKNUMBER) ? MAXYOMIASKNUMBER : i; return (i > MAXYOMIASKNUMBER) ? MAXYOMIASKNUMBER : i;
} }
static int static int
last_strcmp(u_char *src, u_char *dst) last_strcmp(u_char* src, u_char* dst) {
{
int slen; int slen;
int dlen; int dlen;
slen = sstrlen(src); slen = sstrlen(src);
dlen = sstrlen(dst); dlen = sstrlen(dst);
if (dlen > MAXYOMIASKNUMBER * 2) return 0; if(dlen > MAXYOMIASKNUMBER * 2) return 0;
if (sstrcmp(src + (slen - dlen), dst)) return 0; if(sstrcmp(src + (slen - dlen), dst)) return 0;
return (dlen / 2); return (dlen / 2);
} }
int cvtknj(u_char* yomi, u_char* knj, u_char* dst) {
int
cvtknj(u_char *yomi, u_char *knj, u_char *dst)
{
u_char kana[MAXWDYOMILEN * 2 + 1]; u_char kana[MAXWDYOMILEN * 2 + 1];
int len; int len;
u_char *keep; u_char* keep;
keep = dst; keep = dst;
yomi2kata(yomi, kana); yomi2kata(yomi, kana);
if (len = top_strcmp(yomi, knj)) { if(len = top_strcmp(yomi, knj)) {
*dst = (u_char)(ZENHIRAASSYUKU | (len - 1)); *dst = (u_char)(ZENHIRAASSYUKU | (len - 1));
} } else if(len = top_strcmp(kana, knj)) {
else if (len = top_strcmp(kana, knj)) {
*dst = (u_char)(ZENKATAASSYUKU | (len - 1)); *dst = (u_char)(ZENKATAASSYUKU | (len - 1));
} }
if (len) { if(len) {
knj += len * 2; knj += len * 2;
dst++; dst++;
} }
if (*knj) { if(*knj) {
for ( ; ; ) { for(;;) {
if (len = last_strcmp(yomi, knj)) { if(len = last_strcmp(yomi, knj)) {
*dst++ = (u_char)(ZENHIRAASSYUKU | (len - 1)); *dst++ = (u_char)(ZENHIRAASSYUKU | (len - 1));
break; break;
} } else if(len = last_strcmp(kana, knj)) {
else if (len = last_strcmp(kana, knj)) {
*dst++ = (u_char)(ZENKATAASSYUKU | (len - 1)); *dst++ = (u_char)(ZENKATAASSYUKU | (len - 1));
break; break;
} } else if(*knj == SS2) {
else if (*knj == SS2) {
knj++; knj++;
*dst++ = (u_char)LEADINGHANKAKU; *dst++ = (u_char)LEADINGHANKAKU;
*dst++ = *knj++; *dst++ = *knj++;
} else if (*knj == SS3) { } else if(*knj == SS3) {
knj++;
*dst++ = (*knj & NORMALKANJIMASK);
knj++; knj++;
*dst++ = (*knj & NORMALKANJIMASK); knj++;
*dst++ = *knj++; *dst++ = *knj++;
} else if (*knj & 0x80) { } else if(*knj & 0x80) {
*dst++ = (*knj & NORMALKANJIMASK); knj++; *dst++ = (*knj & NORMALKANJIMASK);
*dst++ = (*knj & NORMALKANJIMASK); knj++; knj++;
} *dst++ = (*knj & NORMALKANJIMASK);
else { knj++;
} else {
*dst++ = (u_char)LEADINGHANKAKU; *dst++ = (u_char)LEADINGHANKAKU;
*dst++ = *knj++; *dst++ = *knj++;
} }
if (!*knj) { if(!*knj) {
break; break;
} }
} }
@ -260,12 +229,8 @@ cvtknj(u_char *yomi, u_char *knj, u_char *dst)
return (dst - keep); return (dst - keep);
} }
int srchkana(u_char** ptr, int* saml) {
u_char* p;
int
srchkana(u_char **ptr, int *saml)
{
u_char *p;
int cmp; int cmp;
int cnt = 0; int cnt = 0;
u_char same; u_char same;
@ -275,12 +240,12 @@ srchkana(u_char **ptr, int *saml)
p = segtop(); p = segtop();
while (!segend(p)) { while(!segend(p)) {
if (flg == 0) { if(flg == 0) {
cmp = yomicmp(cnvstart, p, &same); cmp = yomicmp(cnvstart, p, &same);
if (cmp == OVER) break; if(cmp == OVER) break;
if (cmp == MATCH && *(cnvstart + same) == 0) { if(cmp == MATCH && *(cnvstart + same) == 0) {
*ptr = p; *ptr = p;
*saml = same; *saml = same;
flg = 1; flg = 1;
@ -290,19 +255,15 @@ srchkana(u_char **ptr, int *saml)
cnt++; cnt++;
} }
if (flg != 0) return cnt; if(flg != 0) return cnt;
*ptr = p; *ptr = p;
*saml = same; *saml = same;
return 0; return 0;
} }
int srchgram(u_char* ptr, u_char** dst, TypeGram hinsi) {
u_char* endp;
int
srchgram(u_char *ptr, u_char **dst, TypeGram hinsi)
{
u_char *endp;
int cnt = 0, nlen; int cnt = 0, nlen;
int flg = FALSE; int flg = FALSE;
@ -311,30 +272,26 @@ srchgram(u_char *ptr, u_char **dst, TypeGram hinsi)
nlen = getnlen(ptr); nlen = getnlen(ptr);
ptr += DOUONBLKSIZENUMBER + nlen; ptr += DOUONBLKSIZENUMBER + nlen;
while (ptr < endp) { while(ptr < endp) {
if (*ptr == hinsi) { if(*ptr == hinsi) {
*dst = ptr; *dst = ptr;
flg = TRUE; flg = TRUE;
} }
do { do {
ptr += codesize(*ptr); ptr += codesize(*ptr);
} while (*ptr != HINSIBLKTERM); } while(*ptr != HINSIBLKTERM);
ptr++; ptr++;
cnt++; cnt++;
} }
if (flg) return cnt; if(flg) return cnt;
*dst = ptr; *dst = ptr;
return 0; return 0;
} }
int srchkanji(u_char** dst, u_char* knj, int klen) {
u_char* ptr;
int
srchkanji(u_char **dst, u_char *knj, int klen)
{
u_char *ptr;
u_char *p, *q; u_char *p, *q;
int len; int len;
int flg = FALSE; int flg = FALSE;
@ -342,45 +299,38 @@ srchkanji(u_char **dst, u_char *knj, int klen)
ptr = *dst + 1; ptr = *dst + 1;
while (*ptr != HINSIBLKTERM) { while(*ptr != HINSIBLKTERM) {
for (p = ptr, q = knj, len = klen ; len ; len--) for(p = ptr, q = knj, len = klen; len; len--)
if (*p++ != *q++) break; if(*p++ != *q++) break;
if (!len) { if(!len) {
*dst = ptr; *dst = ptr;
flg = TRUE; flg = TRUE;
} }
while (!(*ptr == KANJISTREND)) { while(!(*ptr == KANJISTREND)) {
ptr += codesize(*ptr); ptr += codesize(*ptr);
} }
ptr++; ptr++;
cnt++; cnt++;
} }
if (!flg) *dst = ptr; if(!flg) *dst = ptr;
return cnt; return cnt;
} }
TypeIdxOfs TypeIdxOfs
count_uidx() count_uidx() {
{ u_char* p;
u_char *p;
p = get_idxptr(curdict->segunit - 1); p = get_idxptr(curdict->segunit - 1);
while (*p++) ; while(*p++);
return (curdict->idxlen - (p - idxbuf)); return (curdict->idxlen - (p - idxbuf));
} }
void chg_uidx(TypeDicSeg seg, u_char* yomi, int len) {
void
chg_uidx(TypeDicSeg seg, u_char *yomi, int len)
{
u_char *p, *q; u_char *p, *q;
int olen; int olen;
@ -390,13 +340,12 @@ chg_uidx(TypeDicSeg seg, u_char *yomi, int len)
q = idxbuf + curdict->idxlen; q = idxbuf + curdict->idxlen;
if (len > olen) { if(len > olen) {
mvmemd(q - (len-olen), q, (int)(q - (len-olen) - p)); mvmemd(q - (len - olen), q, (int)(q - (len - olen) - p));
} else {
mvmemi(p + (olen - len), p, (int)(q - (p + (olen - len))));
} }
else { while(len--) *p++ = *yomi++;
mvmemi(p + (olen-len), p, (int)(q - (p + (olen-len))));
}
while (len--) *p++ = *yomi++;
(*curdict->putidx)(curdict, 0); (*curdict->putidx)(curdict, 0);

62
lib/sj3core/alloc.c
View file

@ -33,7 +33,6 @@
* $SonyDate: 1994/06/03 08:01:28 $ * $SonyDate: 1994/06/03 08:01:28 $
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include "sj_rename.h" #include "sj_rename.h"
@ -47,61 +46,54 @@
#define JREC_NUM 128 #define JREC_NUM 128
#define CLREC_NUM 128 #define CLREC_NUM 128
static JREC *jrec = NULL; static JREC* jrec = NULL;
static CLREC *clrec = NULL; static CLREC* clrec = NULL;
JREC * JREC* alloc_jrec() {
alloc_jrec() JREC* p;
{
JREC *p;
int i; int i;
if (jrec == NULL) { if(jrec == NULL) {
jrec = (JREC *)malloc(sizeof(JREC) * JREC_NUM); jrec = (JREC*)malloc(sizeof(JREC) * JREC_NUM);
if (jrec == NULL) return (JREC *)malloc(sizeof(JREC)); if(jrec == NULL) return (JREC*)malloc(sizeof(JREC));
for (i = 0, p = jrec ; i < JREC_NUM - 1 ; i++, p++) for(i = 0, p = jrec; i < JREC_NUM - 1; i++, p++)
p -> jsort = p + 1; p->jsort = p + 1;
p -> jsort = NULL; p->jsort = NULL;
} }
p = jrec; p = jrec;
jrec = jrec -> jsort; jrec = jrec->jsort;
return p; return p;
} }
void void free_jrec(JREC* p) {
free_jrec(JREC *p) if(p != NULL) {
{ p->jsort = jrec;
if (p != NULL) {
p -> jsort = jrec;
jrec = p; jrec = p;
} }
} }
CLREC * CLREC*
alloc_clrec() alloc_clrec() {
{ CLREC* p;
CLREC *p;
int i; int i;
if (clrec == NULL) { if(clrec == NULL) {
clrec = (CLREC *)malloc(sizeof(CLREC) * CLREC_NUM); clrec = (CLREC*)malloc(sizeof(CLREC) * CLREC_NUM);
if (clrec == NULL) return (CLREC *)malloc(sizeof(CLREC)); if(clrec == NULL) return (CLREC*)malloc(sizeof(CLREC));
for (i = 0, p = clrec ; i < CLREC_NUM - 1 ; i++, p++) for(i = 0, p = clrec; i < CLREC_NUM - 1; i++, p++)
p -> clsort = p + 1; p->clsort = p + 1;
p -> clsort = NULL; p->clsort = NULL;
} }
p = clrec; p = clrec;
clrec = clrec -> clsort; clrec = clrec->clsort;
return p; return p;
} }
void void free_clrec(CLREC* p) {
free_clrec(CLREC *p) if(p != NULL) {
{ p->clsort = clrec;
if (p != NULL) {
p -> clsort = clrec;
clrec = p; clrec = p;
} }
} }

10
lib/sj3core/charsize.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:01:29 $ * $SonyDate: 1994/06/03 08:01:29 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
@ -43,10 +40,8 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int codesize(u_char code) {
codesize(u_char code) switch(code & KANJIMODEMASK) {
{
switch (code & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
case KANJIASSYUKU: case KANJIASSYUKU:
@ -60,4 +55,3 @@ codesize(u_char code)
return 2; return 2;
} }
} }

8
lib/sj3core/chrtbl.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:01:30 $ * $SonyDate: 1994/06/03 08:01:30 $
*/ */
#include "sj_const.h" #include "sj_const.h"
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
@ -43,7 +40,7 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
u_char chrtbl[256] = u_char chrtbl[256] =
{ {
0, 0,
FZKTOP, FZKTOP,
DICTOP + TAI_KGU, DICTOP + TAI_KGU,
@ -299,5 +296,4 @@ u_char chrtbl[256] =
TAI_KGU, TAI_KGU,
TAI_KGU, TAI_KGU,
TAI_KGU, TAI_KGU,
0 0};
};

112
lib/sj3core/cl2knj.c
View file

@ -37,29 +37,26 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
static CLREC *nextrecblk(), *prevrecblk(); static CLREC *nextrecblk(), *prevrecblk();
static void initkbuf(u_char *); static void initkbuf(u_char*);
int cl2knj(u_char* yomi, int len, u_char* kouho) {
int u_char* ptr1;
cl2knj(u_char *yomi, int len, u_char *kouho) u_char* ptr2;
{
u_char *ptr1;
u_char *ptr2;
int i; int i;
khcount = nkhcount = 0; khcount = nkhcount = 0;
initkbuf(kouho); initkbuf(kouho);
if (len > MAXCLINPUTLEN * 2) len = MAXCLINPUTLEN * 2; if(len > MAXCLINPUTLEN * 2) len = MAXCLINPUTLEN * 2;
ptr1 = yomi; ptr2 = hyomi; ptr1 = yomi;
for (i = 0 ; i < len ; i++) { ptr2 = hyomi;
if (isknj1(*ptr1)) { for(i = 0; i < len; i++) {
if (++i >= len) break; if(isknj1(*ptr1)) {
if(++i >= len) break;
} }
ptr1 += sj2cd_chr(ptr1, ptr2++); ptr1 += sj2cd_chr(ptr1, ptr2++);
} }
@ -67,7 +64,7 @@ cl2knj(u_char *yomi, int len, u_char *kouho)
strlcpy(orgyomi, yomi, (int)(ptr1 - yomi) + 1); strlcpy(orgyomi, yomi, (int)(ptr1 - yomi) + 1);
if (!hyomi[0]) return 0; if(!hyomi[0]) return 0;
freework(); freework();
@ -79,7 +76,7 @@ cl2knj(u_char *yomi, int len, u_char *kouho)
mkbunsetu(); mkbunsetu();
if (!maxclptr) wakachi(); if(!maxclptr) wakachi();
jrt1st = maxjptr; jrt1st = maxjptr;
clt1st = maxclptr; clt1st = maxclptr;
@ -92,21 +89,17 @@ cl2knj(u_char *yomi, int len, u_char *kouho)
cvtclknj(); cvtclknj();
return hzstrlen(inputyomi, (int)clt1st -> cllen); return hzstrlen(inputyomi, (int)clt1st->cllen);
} }
int nextcl(u_char* kouho, int mode) {
CLREC* clptr;
int
nextcl(u_char *kouho, int mode)
{
CLREC *clptr;
initkbuf(kouho); initkbuf(kouho);
if (!khcount) return 0; if(!khcount) return 0;
if (!mode && (selectid < khcount)) if(!mode && (selectid < khcount))
selectid++; selectid++;
else if((mode < 2) && (clptr = nextrecblk())) { else if((mode < 2) && (clptr = nextrecblk())) {
@ -114,107 +107,86 @@ nextcl(u_char *kouho, int mode)
clt1st = clptr; clt1st = clptr;
mkkouho(); mkkouho();
getrank(); getrank();
} } else {
else {
cvtclknj(); cvtclknj();
return 0; return 0;
} }
cvtclknj(); cvtclknj();
return hzstrlen(inputyomi, (int)clt1st -> cllen); return hzstrlen(inputyomi, (int)clt1st->cllen);
} }
static CLREC* static CLREC*
nextrecblk() nextrecblk() {
{ CLREC* clptr;
CLREC *clptr;
int keeplen; int keeplen;
keeplen = clt1st -> cllen; keeplen = clt1st->cllen;
clptr = clt1st -> clsort; clptr = clt1st->clsort;
while (clptr && (int)clptr -> cllen == keeplen) while(clptr && (int)clptr->cllen == keeplen)
clptr = clptr -> clsort; clptr = clptr->clsort;
return clptr; return clptr;
} }
int prevcl(u_char* kouho, int mode) {
CLREC* clptr;
int
prevcl(u_char *kouho, int mode)
{
CLREC *clptr;
initkbuf(kouho); initkbuf(kouho);
if (!khcount) return 0; if(!khcount) return 0;
if (!mode && (selectid > 1)) if(!mode && (selectid > 1))
selectid--; selectid--;
else if ((mode < 2) && (clptr = prevrecblk())) { else if((mode < 2) && (clptr = prevrecblk())) {
clt1st = clptr; clt1st = clptr;
mkkouho(); mkkouho();
getrank(); getrank();
selectid = khcount; selectid = khcount;
} } else {
else {
cvtclknj(); cvtclknj();
return 0; return 0;
} }
cvtclknj(); cvtclknj();
return hzstrlen(inputyomi, (int)clt1st -> cllen); return hzstrlen(inputyomi, (int)clt1st->cllen);
} }
static CLREC* static CLREC*
prevrecblk() prevrecblk() {
{ CLREC* clptr;
CLREC *clptr; CLREC* keepptr;
CLREC *keepptr;
int keeplen; int keeplen;
int cllen; int cllen;
clptr = maxclptr; clptr = maxclptr;
if ((cllen = clt1st -> cllen) == clptr -> cllen) if((cllen = clt1st->cllen) == clptr->cllen)
return NULL; return NULL;
while ((int)clptr -> cllen > cllen) { while((int)clptr->cllen > cllen) {
keeplen = clptr -> cllen; keeplen = clptr->cllen;
keepptr = clptr; keepptr = clptr;
while ((int)clptr -> cllen == keeplen) while((int)clptr->cllen == keeplen)
clptr = clptr -> clsort; clptr = clptr->clsort;
} }
return keepptr; return keepptr;
} }
static void static void
initkbuf(u_char *kouho) initkbuf(u_char* kouho) {
{
kanjitmp = kouho; kanjitmp = kouho;
memset(kanjitmp, 0, sizeof(STDYOUT) + 1); memset(kanjitmp, 0, sizeof(STDYOUT) + 1);
} }
int selectnum() {
int
selectnum()
{
return selectid; return selectid;
} }

139
lib/sj3core/clstudy.c
View file

@ -33,22 +33,14 @@
* $SonyDate: 1994/06/03 08:01:32 $ * $SonyDate: 1994/06/03 08:01:32 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static u_char *delcldata(), *srchclpos(); static u_char *delcldata(), *srchclpos();
static int delclold(); static int delclold();
int clstudy(u_char* yomi1, u_char* yomi2, STDYOUT* stdy) {
int
clstudy(u_char *yomi1, u_char *yomi2, STDYOUT *stdy)
{
u_char ytmp[CLSTDY_TMPLEN]; u_char ytmp[CLSTDY_TMPLEN];
u_char *dst, *ptr; u_char *dst, *ptr;
int ret; int ret;
@ -56,58 +48,55 @@ clstudy(u_char *yomi1, u_char *yomi2, STDYOUT *stdy)
int alen, blen; int alen, blen;
int i; int i;
if (!StudyExist()) return CLSTUDYNODICT; if(!StudyExist()) return CLSTUDYNODICT;
if (!yomi1 || !*yomi1) return CLSTUDYPARAERR; if(!yomi1 || !*yomi1) return CLSTUDYPARAERR;
if (!yomi2 || !*yomi2) { if(!yomi2 || !*yomi2) {
if (!sj2cd_str(yomi1, ytmp, CLSTDY_TMPLEN)) if(!sj2cd_str(yomi1, ytmp, CLSTDY_TMPLEN))
return CLSTUDYYOMIERR; return CLSTUDYYOMIERR;
(void)delcldata(ytmp); (void)delcldata(ytmp);
ret = CLSTUDYNORMEND; ret = CLSTUDYNORMEND;
} } else if(!stdy)
else if (!stdy)
return CLSTUDYPARAERR; return CLSTUDYPARAERR;
else { else {
if (!sj2cd_str(yomi1, ytmp, CLSTDY_TMPLEN)) if(!sj2cd_str(yomi1, ytmp, CLSTDY_TMPLEN))
return CLSTUDYYOMIERR; return CLSTUDYYOMIERR;
len1 = sstrlen(ytmp); len1 = sstrlen(ytmp);
if (!sj2cd_str(yomi2, ytmp + len1, CLSTDY_TMPLEN - len1)) if(!sj2cd_str(yomi2, ytmp + len1, CLSTDY_TMPLEN - len1))
return CLSTUDYYOMIERR; return CLSTUDYYOMIERR;
len2 = len1 + stdy -> len; len2 = len1 + stdy->len;
ytmp[len2] = 0; ytmp[len2] = 0;
alen = len2 + CL_HDLEN; alen = len2 + CL_HDLEN;
if (alen + 1 >= CLSTUDYLEN) return CLSTUDYNOAREA; if(alen + 1 >= CLSTUDYLEN) return CLSTUDYNOAREA;
blen = CLSTUDYTAIL - delcldata(ytmp) - 1; blen = CLSTUDYTAIL - delcldata(ytmp) - 1;
while (blen < alen) { while(blen < alen) {
if (!(i = delclold())) break; if(!(i = delclold())) break;
blen += i; blen += i;
} }
if(blen >= alen) {
if (blen >= alen) {
dst = srchclpos(ytmp); dst = srchclpos(ytmp);
ptr = CLSTUDYTAIL - alen; ptr = CLSTUDYTAIL - alen;
mvmemd(ptr, CLSTUDYTAIL, (ptr - dst)); mvmemd(ptr, CLSTUDYTAIL, (ptr - dst));
ClYomiLen(dst) = (u_char)len2; ClYomiLen(dst) = (u_char)len2;
ClGramCode(dst) = stdy -> hinshi; ClGramCode(dst) = stdy->hinshi;
ClYomi1Len(dst) = (u_char)len1; ClYomi1Len(dst) = (u_char)len1;
ClSetNum(dst, 1); ClSetNum(dst, 1);
memcpy(ClYomiPos(dst), ytmp, len2); memcpy(ClYomiPos(dst), ytmp, len2);
ret = CLSTUDYNORMEND; ret = CLSTUDYNORMEND;
} } else
else
ret = CLSTUDYNOAREA; ret = CLSTUDYNOAREA;
} }
mkclidx(); mkclidx();
@ -116,32 +105,28 @@ clstudy(u_char *yomi1, u_char *yomi2, STDYOUT *stdy)
return ret; return ret;
} }
static u_char*
delcldata(u_char* ycode) {
static u_char * u_char* tagptr;
delcldata(u_char *ycode) u_char* ptr1;
{ u_char* ptr2;
u_char *tagptr;
u_char *ptr1;
u_char *ptr2;
int len1; int len1;
tagptr = CLSTUDYDICT; tagptr = CLSTUDYDICT;
while (!iseocl(tagptr)) { while(!iseocl(tagptr)) {
ptr1 = ycode; ptr1 = ycode;
ptr2 = ClYomiPos(tagptr); ptr2 = ClYomiPos(tagptr);
len1 = ClYomiLen(tagptr); len1 = ClYomiLen(tagptr);
while (*ptr1 && len1) { while(*ptr1 && len1) {
if (*ptr1 != *ptr2) break; if(*ptr1 != *ptr2) break;
ptr1++; ptr1++;
ptr2++; ptr2++;
len1--; len1--;
} }
if (!*ptr1 || !len1) { if(!*ptr1 || !len1) {
delclsub(tagptr); delclsub(tagptr);
} } else {
else {
tagptr = ClNextTag(tagptr); tagptr = ClNextTag(tagptr);
} }
} }
@ -149,12 +134,8 @@ delcldata(u_char *ycode)
return tagptr; return tagptr;
} }
void delclsub(u_char* target) {
u_char* src;
void
delclsub(u_char *target)
{
u_char *src;
int num; int num;
int tmp; int tmp;
int len; int len;
@ -170,10 +151,10 @@ delclsub(u_char *target)
memset(CLSTUDYTAIL - len, 0, len); memset(CLSTUDYTAIL - len, 0, len);
src = CLSTUDYDICT; src = CLSTUDYDICT;
while (!iseocl(src)) { while(!iseocl(src)) {
tmp = ClGetNum(src); tmp = ClGetNum(src);
if (tmp > num) { if(tmp > num) {
tmp -= 1; tmp -= 1;
ClSetNum(src, tmp); ClSetNum(src, tmp);
} }
@ -182,13 +163,10 @@ delclsub(u_char *target)
} }
} }
static int static int
delclold() delclold() {
{ u_char* tagptr;
u_char *tagptr; u_char* target;
u_char *target;
int num; int num;
int tmp; int tmp;
@ -196,10 +174,10 @@ delclold()
num = 0; num = 0;
tagptr = CLSTUDYDICT; tagptr = CLSTUDYDICT;
while (!iseocl(tagptr)) { while(!iseocl(tagptr)) {
tmp = ClGetNum(tagptr); tmp = ClGetNum(tagptr);
if (tmp >= num) { if(tmp >= num) {
num = tmp; num = tmp;
target = tagptr; target = tagptr;
} }
@ -207,7 +185,7 @@ delclold()
tagptr = ClNextTag(tagptr); tagptr = ClNextTag(tagptr);
} }
if (target) { if(target) {
num = ClBlkLen(tagptr); num = ClBlkLen(tagptr);
delclsub(target); delclsub(target);
} }
@ -215,21 +193,18 @@ delclold()
return num; return num;
} }
static u_char*
srchclpos(u_char* ycode) {
static u_char * u_char* tagptr;
srchclpos(u_char *ycode) u_char* target;
{ u_char* ptr1;
u_char *tagptr; u_char* ptr2;
u_char *target;
u_char *ptr1;
u_char *ptr2;
int len; int len;
int tmp; int tmp;
target = NULL; target = NULL;
tagptr = CLSTUDYDICT; tagptr = CLSTUDYDICT;
while (!iseocl(tagptr)) { while(!iseocl(tagptr)) {
tmp = ClGetNum(tagptr); tmp = ClGetNum(tagptr);
tmp++; tmp++;
@ -238,19 +213,19 @@ srchclpos(u_char *ycode)
ptr1 = ycode; ptr1 = ycode;
ptr2 = ClYomiPos(tagptr); ptr2 = ClYomiPos(tagptr);
len = ClYomiLen(tagptr); len = ClYomiLen(tagptr);
while (*ptr1 && len) { while(*ptr1 && len) {
if (*ptr1 != *ptr2) break; if(*ptr1 != *ptr2) break;
ptr1++; ptr1++;
ptr2++; ptr2++;
len--; len--;
} }
if (!target) { if(!target) {
if (!len) if(!len)
; ;
else if (!*ptr1) else if(!*ptr1)
target = tagptr; target = tagptr;
else if (*ptr1 < *ptr2) else if(*ptr1 < *ptr2)
target = tagptr; target = tagptr;
} }
tagptr = ClNextTag(tagptr); tagptr = ClNextTag(tagptr);
@ -259,25 +234,21 @@ srchclpos(u_char *ycode)
return target ? target : tagptr; return target ? target : tagptr;
} }
void mkclidx() {
u_char* ptr;
void
mkclidx()
{
u_char *ptr;
int num; int num;
int st, ed; int st, ed;
if (!StudyExist()) return; if(!StudyExist()) return;
ptr = CLSTUDYDICT; ptr = CLSTUDYDICT;
for (num = st = 0 ; st < 0x100 ; num++, st = ed) { for(num = st = 0; st < 0x100; num++, st = ed) {
ed = st + CLSTUDYSTEP; ed = st + CLSTUDYSTEP;
while (!iseocl(ptr)) { while(!iseocl(ptr)) {
if ((unsigned int) *ClYomiPos(ptr) >= st) break; if((unsigned int)*ClYomiPos(ptr) >= st) break;
ptr = ClNextTag(ptr); ptr = ClNextTag(ptr);
} }
if (ClYomiLen(ptr) && ((int)*ClYomiPos(ptr) < ed)) if(ClYomiLen(ptr) && ((int)*ClYomiPos(ptr) < ed))
CLSTUDYIDX[num] = ptr - CLSTUDYDICT; CLSTUDYIDX[num] = ptr - CLSTUDYDICT;
else else
CLSTUDYIDX[num] = (u_short)-1; CLSTUDYIDX[num] = (u_short)-1;

14
lib/sj3core/cmpstr.c
View file

@ -33,26 +33,20 @@
* $SonyDate: 1994/06/03 08:01:32 $ * $SonyDate: 1994/06/03 08:01:32 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_const.h" #include "sj_const.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int cmpstr(u_char* src, u_char* dst) {
cmpstr(u_char *src, u_char *dst) while(*src) {
{ if(*src != *dst) return FALSE;
while (*src) {
if (*src != *dst) return FALSE;
src++; src++;
dst++; dst++;
} }
if (*dst) return FALSE; if(*dst) return FALSE;
return TRUE; return TRUE;
} }

202
lib/sj3core/conjunc.c
View file

@ -33,7 +33,6 @@
* $SonyDate: 1994/06/03 08:01:33 $ * $SonyDate: 1994/06/03 08:01:33 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_yomi.h" #include "sj_yomi.h"
@ -60,8 +59,7 @@ static u_char sahencnj[] = {
0x31, _RE, R_KATEI2, 0x31, _RE, R_KATEI2,
0x31, _RO, R_MEIREI1, 0x31, _RO, R_MEIREI1,
0x11, _YO, R_MEIREI2, 0x11, _YO, R_MEIREI2,
0xff 0xff};
};
static u_char zahencnj[] = { static u_char zahencnj[] = {
0x00, R_CUT, 0x00, R_CUT,
@ -74,8 +72,7 @@ static u_char zahencnj[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x01, _ZE, R_MIZEN3, 0x01, _ZE, R_MIZEN3,
0x11, _YO, R_MEIREI2, 0x11, _YO, R_MEIREI2,
0xff 0xff};
};
static u_char ka5cnj1[] = { static u_char ka5cnj1[] = {
0x01, _I, R_ONBIN2, 0x01, _I, R_ONBIN2,
@ -84,8 +81,7 @@ static u_char ka5cnj1[] = {
0x01, _KU, R_SHUUSI, 0x01, _KU, R_SHUUSI,
0x01, _KE, R_KAMEI, 0x01, _KE, R_KAMEI,
0x02, _KO, _U, R_AROU, 0x02, _KO, _U, R_AROU,
0xff 0xff};
};
static u_char ka5cnj3[] = { static u_char ka5cnj3[] = {
0x01, _I, R_ONBIN2, 0x01, _I, R_ONBIN2,
@ -94,8 +90,7 @@ static u_char ka5cnj3[] = {
0x01, _KU, R_SHUUSI, 0x01, _KU, R_SHUUSI,
0x01, _KE, R_KAMEI, 0x01, _KE, R_KAMEI,
0x02, _KO, _U, R_AROU, 0x02, _KO, _U, R_AROU,
0xff 0xff};
};
static u_char ka5cnj5[] = { static u_char ka5cnj5[] = {
0x01, _I, R_ONBIN2, 0x01, _I, R_ONBIN2,
@ -110,8 +105,7 @@ static u_char ka5cnj5[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _KO, _U, R_AROU, 0x02, _KO, _U, R_AROU,
0xff 0xff};
};
static u_char ka5cnj7[] = { static u_char ka5cnj7[] = {
0x01, _I, R_ONBIN2, 0x01, _I, R_ONBIN2,
@ -126,8 +120,7 @@ static u_char ka5cnj7[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _KO, _U, R_AROU, 0x02, _KO, _U, R_AROU,
0xff 0xff};
};
static u_char ga5cnj1[] = { static u_char ga5cnj1[] = {
0x01, _I, R_ONBIN3, 0x01, _I, R_ONBIN3,
@ -136,8 +129,7 @@ static u_char ga5cnj1[] = {
0x01, _GU, R_SHUUSI, 0x01, _GU, R_SHUUSI,
0x01, _GE, R_KAMEI, 0x01, _GE, R_KAMEI,
0x02, _GO, _U, R_AROU, 0x02, _GO, _U, R_AROU,
0xff 0xff};
};
static u_char ga5cnj3[] = { static u_char ga5cnj3[] = {
0x01, _I, R_ONBIN3, 0x01, _I, R_ONBIN3,
@ -146,8 +138,7 @@ static u_char ga5cnj3[] = {
0x01, _GU, R_SHUUSI, 0x01, _GU, R_SHUUSI,
0x01, _GE, R_KAMEI, 0x01, _GE, R_KAMEI,
0x02, _GO, _U, R_AROU, 0x02, _GO, _U, R_AROU,
0xff 0xff};
};
static u_char ga5cnj5[] = { static u_char ga5cnj5[] = {
0x01, _I, R_ONBIN3, 0x01, _I, R_ONBIN3,
@ -162,8 +153,7 @@ static u_char ga5cnj5[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _GO, _U, R_AROU, 0x02, _GO, _U, R_AROU,
0xff 0xff};
};
static u_char ga5cnj7[] = { static u_char ga5cnj7[] = {
0x01, _I, R_ONBIN3, 0x01, _I, R_ONBIN3,
@ -178,8 +168,7 @@ static u_char ga5cnj7[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _GO, _U, R_AROU, 0x02, _GO, _U, R_AROU,
0xff 0xff};
};
static u_char sa5cnj1[] = { static u_char sa5cnj1[] = {
0x01, _SA, R_MIZEN5, 0x01, _SA, R_MIZEN5,
@ -187,8 +176,7 @@ static u_char sa5cnj1[] = {
0x01, _SU, R_SHUUSI, 0x01, _SU, R_SHUUSI,
0x01, _SE, R_KAMEI, 0x01, _SE, R_KAMEI,
0x02, _SO, _U, R_AROU, 0x02, _SO, _U, R_AROU,
0xff 0xff};
};
static u_char sa5cnj3[] = { static u_char sa5cnj3[] = {
0x01, _SA, R_MIZEN5, 0x01, _SA, R_MIZEN5,
@ -196,8 +184,7 @@ static u_char sa5cnj3[] = {
0x01, _SU, R_SHUUSI, 0x01, _SU, R_SHUUSI,
0x01, _SE, R_KAMEI, 0x01, _SE, R_KAMEI,
0x02, _SO, _U, R_AROU, 0x02, _SO, _U, R_AROU,
0xff 0xff};
};
static u_char sa5cnj5[] = { static u_char sa5cnj5[] = {
0x01, _SA, R_MIZEN5, 0x01, _SA, R_MIZEN5,
@ -207,8 +194,7 @@ static u_char sa5cnj5[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _SO, _U, R_AROU, 0x02, _SO, _U, R_AROU,
0xff 0xff};
};
static u_char sa5cnj7[] = { static u_char sa5cnj7[] = {
0x01, _SA, R_MIZEN5, 0x01, _SA, R_MIZEN5,
@ -218,8 +204,7 @@ static u_char sa5cnj7[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _SO, _U, R_AROU, 0x02, _SO, _U, R_AROU,
0xff 0xff};
};
static u_char ta5cnj1[] = { static u_char ta5cnj1[] = {
0x01, _TA, R_MIZEN5, 0x01, _TA, R_MIZEN5,
@ -228,8 +213,7 @@ static u_char ta5cnj1[] = {
0x01, _TU, R_SHUUSI, 0x01, _TU, R_SHUUSI,
0x01, _TE, R_KAMEI, 0x01, _TE, R_KAMEI,
0x02, _TO, _U, R_AROU, 0x02, _TO, _U, R_AROU,
0xff 0xff};
};
static u_char ta5cnj3[] = { static u_char ta5cnj3[] = {
0x01, _TA, R_MIZEN5, 0x01, _TA, R_MIZEN5,
@ -238,8 +222,7 @@ static u_char ta5cnj3[] = {
0x01, _TU, R_SHUUSI, 0x01, _TU, R_SHUUSI,
0x01, _TE, R_KAMEI, 0x01, _TE, R_KAMEI,
0x02, _TO, _U, R_AROU, 0x02, _TO, _U, R_AROU,
0xff 0xff};
};
static u_char ta5cnj5[] = { static u_char ta5cnj5[] = {
0x01, _TA, R_MIZEN5, 0x01, _TA, R_MIZEN5,
@ -254,8 +237,7 @@ static u_char ta5cnj5[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _TO, _U, R_AROU, 0x02, _TO, _U, R_AROU,
0xff 0xff};
};
static u_char ta5cnj7[] = { static u_char ta5cnj7[] = {
0x01, _TA, R_MIZEN5, 0x01, _TA, R_MIZEN5,
@ -270,9 +252,7 @@ static u_char ta5cnj7[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _TO, _U, R_AROU, 0x02, _TO, _U, R_AROU,
0xff 0xff};
};
static u_char na5cnj[] = { static u_char na5cnj[] = {
0x01, _NA, R_MIZEN5, 0x01, _NA, R_MIZEN5,
@ -281,8 +261,7 @@ static u_char na5cnj[] = {
0x01, _NE, R_KAMEI, 0x01, _NE, R_KAMEI,
0x02, _NO, _U, R_AROU, 0x02, _NO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ba5cnj1[] = { static u_char ba5cnj1[] = {
0x01, _BA, R_MIZEN5, 0x01, _BA, R_MIZEN5,
@ -291,8 +270,7 @@ static u_char ba5cnj1[] = {
0x01, _BE, R_KAMEI, 0x01, _BE, R_KAMEI,
0x02, _BO, _U, R_AROU, 0x02, _BO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ba5cnj3[] = { static u_char ba5cnj3[] = {
0x01, _BA, R_MIZEN5, 0x01, _BA, R_MIZEN5,
@ -301,8 +279,7 @@ static u_char ba5cnj3[] = {
0x01, _BE, R_KAMEI, 0x01, _BE, R_KAMEI,
0x02, _BO, _U, R_AROU, 0x02, _BO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ba5cnj5[] = { static u_char ba5cnj5[] = {
0x01, _BA, R_MIZEN5, 0x01, _BA, R_MIZEN5,
@ -317,8 +294,7 @@ static u_char ba5cnj5[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _BO, _U, R_AROU, 0x02, _BO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ba5cnj7[] = { static u_char ba5cnj7[] = {
0x01, _BA, R_MIZEN5, 0x01, _BA, R_MIZEN5,
@ -333,8 +309,7 @@ static u_char ba5cnj7[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _BO, _U, R_AROU, 0x02, _BO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ma5cnj1[] = { static u_char ma5cnj1[] = {
0x01, _MA, R_MIZEN5, 0x01, _MA, R_MIZEN5,
@ -343,8 +318,7 @@ static u_char ma5cnj1[] = {
0x01, _ME, R_KAMEI, 0x01, _ME, R_KAMEI,
0x02, _MO, _U, R_AROU, 0x02, _MO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ma5cnj3[] = { static u_char ma5cnj3[] = {
0x01, _MA, R_MIZEN5, 0x01, _MA, R_MIZEN5,
@ -353,8 +327,7 @@ static u_char ma5cnj3[] = {
0x01, _ME, R_KAMEI, 0x01, _ME, R_KAMEI,
0x02, _MO, _U, R_AROU, 0x02, _MO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ma5cnj5[] = { static u_char ma5cnj5[] = {
0x01, _MA, R_MIZEN5, 0x01, _MA, R_MIZEN5,
@ -369,8 +342,7 @@ static u_char ma5cnj5[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _MO, _U, R_AROU, 0x02, _MO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ma5cnj7[] = { static u_char ma5cnj7[] = {
0x01, _MA, R_MIZEN5, 0x01, _MA, R_MIZEN5,
@ -385,8 +357,7 @@ static u_char ma5cnj7[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _MO, _U, R_AROU, 0x02, _MO, _U, R_AROU,
0x01, _NN, R_ONBIN3, 0x01, _NN, R_ONBIN3,
0xff 0xff};
};
static u_char ra5cnj1[] = { static u_char ra5cnj1[] = {
0x01, _XTU, R_ONBIN2, 0x01, _XTU, R_ONBIN2,
@ -395,8 +366,7 @@ static u_char ra5cnj1[] = {
0x01, _RU, R_SHUUSI, 0x01, _RU, R_SHUUSI,
0x01, _RE, R_KAMEI, 0x01, _RE, R_KAMEI,
0x02, _RO, _U, R_AROU, 0x02, _RO, _U, R_AROU,
0xff 0xff};
};
static u_char ra5cnj3[] = { static u_char ra5cnj3[] = {
0x01, _XTU, R_ONBIN2, 0x01, _XTU, R_ONBIN2,
@ -405,8 +375,7 @@ static u_char ra5cnj3[] = {
0x01, _RU, R_SHUUSI, 0x01, _RU, R_SHUUSI,
0x01, _RE, R_KAMEI, 0x01, _RE, R_KAMEI,
0x02, _RO, _U, R_AROU, 0x02, _RO, _U, R_AROU,
0xff 0xff};
};
static u_char ra5cnj5[] = { static u_char ra5cnj5[] = {
0x01, _XTU, R_ONBIN2, 0x01, _XTU, R_ONBIN2,
@ -421,8 +390,7 @@ static u_char ra5cnj5[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _RO, _U, R_AROU, 0x02, _RO, _U, R_AROU,
0xff 0xff};
};
static u_char ra5cnj7[] = { static u_char ra5cnj7[] = {
0x01, _XTU, R_ONBIN2, 0x01, _XTU, R_ONBIN2,
@ -437,8 +405,7 @@ static u_char ra5cnj7[] = {
0x11, _RU, R_SHUUSI, 0x11, _RU, R_SHUUSI,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x02, _RO, _U, R_AROU, 0x02, _RO, _U, R_AROU,
0xff 0xff};
};
static u_char wa5cnj1[] = { static u_char wa5cnj1[] = {
0x01, _I, R_RENYOU5, 0x01, _I, R_RENYOU5,
@ -447,8 +414,7 @@ static u_char wa5cnj1[] = {
0x02, _O, _U, R_AROU, 0x02, _O, _U, R_AROU,
0x01, _XTU, R_ONBIN2, 0x01, _XTU, R_ONBIN2,
0x01, _WA, R_MIZEN5, 0x01, _WA, R_MIZEN5,
0xff 0xff};
};
static u_char wa5cnj3[] = { static u_char wa5cnj3[] = {
0x01, _I, R_RENYOU7, 0x01, _I, R_RENYOU7,
@ -457,8 +423,7 @@ static u_char wa5cnj3[] = {
0x02, _O, _U, R_AROU, 0x02, _O, _U, R_AROU,
0x01, _XTU, R_ONBIN2, 0x01, _XTU, R_ONBIN2,
0x01, _WA, R_MIZEN5, 0x01, _WA, R_MIZEN5,
0xff 0xff};
};
static u_char wa5cnj5[] = { static u_char wa5cnj5[] = {
0x01, _I, R_RENYOU5, 0x01, _I, R_RENYOU5,
@ -473,8 +438,7 @@ static u_char wa5cnj5[] = {
0x11, _SI, R_SA5RENYOU3, 0x11, _SI, R_SA5RENYOU3,
0x11, _SU, R_SHUUSI, 0x11, _SU, R_SHUUSI,
0x12, _SO, _U, R_AROU, 0x12, _SO, _U, R_AROU,
0xff 0xff};
};
static u_char wa5cnj7[] = { static u_char wa5cnj7[] = {
0x01, _I, R_RENYOU7, 0x01, _I, R_RENYOU7,
@ -489,8 +453,7 @@ static u_char wa5cnj7[] = {
0x11, _SI, R_SA5RENYOU3, 0x11, _SI, R_SA5RENYOU3,
0x11, _SU, R_SHUUSI, 0x11, _SU, R_SHUUSI,
0x12, _SO, _U, R_AROU, 0x12, _SO, _U, R_AROU,
0xff 0xff};
};
static u_char ichicnj1[] = { static u_char ichicnj1[] = {
0x00, R_RENYOU1, 0x00, R_RENYOU1,
@ -498,8 +461,7 @@ static u_char ichicnj1[] = {
0x01, _RU, R_SHUUSI, 0x01, _RU, R_SHUUSI,
0x01, _RE, R_KATEI2, 0x01, _RE, R_KATEI2,
0x01, _RO, R_MEIREI1, 0x01, _RO, R_MEIREI1,
0xff 0xff};
};
static u_char ichicnj3[] = { static u_char ichicnj3[] = {
0x00, R_RENYOU3, 0x00, R_RENYOU3,
@ -507,8 +469,7 @@ static u_char ichicnj3[] = {
0x01, _RU, R_SHUUSI, 0x01, _RU, R_SHUUSI,
0x01, _RE, R_KATEI2, 0x01, _RE, R_KATEI2,
0x01, _RO, R_MEIREI1, 0x01, _RO, R_MEIREI1,
0xff 0xff};
};
static u_char keiyou1[] = { static u_char keiyou1[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -518,8 +479,7 @@ static u_char keiyou1[] = {
0x01, _KI, R_KRENTAI, 0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU, 0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2, 0x02, _KE, _RE, R_KATEI2,
0xff 0xff};
};
static u_char keiyou2[] = { static u_char keiyou2[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -530,8 +490,7 @@ static u_char keiyou2[] = {
0x01, _KU, R_KRENYOU, 0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2, 0x02, _KE, _RE, R_KATEI2,
0x01, _SA, R_FZKMEISI, 0x01, _SA, R_FZKMEISI,
0xff 0xff};
};
static u_char keiyou3[] = { static u_char keiyou3[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -553,8 +512,7 @@ static u_char keiyou3[] = {
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI, 0x01, _SA, R_FZKMEISI,
0xff 0xff};
};
static u_char keiyou4[] = { static u_char keiyou4[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -571,8 +529,7 @@ static u_char keiyou4[] = {
0x01, _KU, R_KRENYOU, 0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2, 0x02, _KE, _RE, R_KATEI2,
0x01, _SA, R_FZKMEISI, 0x01, _SA, R_FZKMEISI,
0xff 0xff};
};
static u_char keiyou5[] = { static u_char keiyou5[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -600,8 +557,7 @@ static u_char keiyou5[] = {
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI, 0x01, _SA, R_FZKMEISI,
0xff 0xff};
};
static u_char keiyou6[] = { static u_char keiyou6[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -634,8 +590,7 @@ static u_char keiyou6[] = {
0x21, _RU, R_DRENTAI3, 0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keiyou7[] = { static u_char keiyou7[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -674,8 +629,7 @@ static u_char keiyou7[] = {
0x21, _RU, R_DRENTAI3, 0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keiyou8[] = { static u_char keiyou8[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -715,8 +669,7 @@ static u_char keiyou8[] = {
0x21, _RU, R_DRENTAI3, 0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keiyou9[] = { static u_char keiyou9[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -744,8 +697,7 @@ static u_char keiyou9[] = {
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0x01, _SA, R_FZKMEISI, 0x01, _SA, R_FZKMEISI,
0xff 0xff};
};
static u_char keiyou10[] = { static u_char keiyou10[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -784,8 +736,7 @@ static u_char keiyou10[] = {
0x21, _RU, R_DRENTAI3, 0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keiyou11[] = { static u_char keiyou11[] = {
0x80, R_KGOKAN, 0x80, R_KGOKAN,
@ -808,8 +759,7 @@ static u_char keiyou11[] = {
0x21, _RU, R_DRENTAI3, 0x21, _RU, R_DRENTAI3,
0x21, _RE, R_KAMEI, 0x21, _RE, R_KAMEI,
0x11, _NI, R_DRENYOU2, 0x11, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keidou1[] = { static u_char keidou1[] = {
0x80, R_DGOKAN, 0x80, R_DGOKAN,
@ -823,16 +773,14 @@ static u_char keidou1[] = {
0x11, _RU, R_DRENTAI3, 0x11, _RU, R_DRENTAI3,
0x11, _RE, R_KAMEI, 0x11, _RE, R_KAMEI,
0x01, _NI, R_DRENYOU2, 0x01, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keidou2[] = { static u_char keidou2[] = {
0x80, R_DGOKAN, 0x80, R_DGOKAN,
0x02, _TA, _RU, R_DRENTAI2, 0x02, _TA, _RU, R_DRENTAI2,
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x01, _TO, R_DRENYOU3, 0x01, _TO, R_DRENYOU3,
0xff 0xff};
};
static u_char keidou4[] = { static u_char keidou4[] = {
0x80, R_DGOKAN, 0x80, R_DGOKAN,
@ -847,8 +795,7 @@ static u_char keidou4[] = {
0x11, _RU, R_DRENTAI3, 0x11, _RU, R_DRENTAI3,
0x11, _RE, R_KAMEI, 0x11, _RE, R_KAMEI,
0x01, _NI, R_DRENYOU2, 0x01, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keidou9[] = { static u_char keidou9[] = {
0x80, R_DGOKAN, 0x80, R_DGOKAN,
@ -864,8 +811,7 @@ static u_char keidou9[] = {
0x01, _NI, R_DRENYOU2, 0x01, _NI, R_DRENYOU2,
0x01, _NO, R_CUT, 0x01, _NO, R_CUT,
0x12, _KO, _TO, R_KOTO, 0x12, _KO, _TO, R_KOTO,
0xff 0xff};
};
static u_char sahenmeisi1[] = { static u_char sahenmeisi1[] = {
0x00, R_SMEISI1, 0x00, R_SMEISI1,
@ -877,8 +823,7 @@ static u_char sahenmeisi1[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x01, _SE, R_MIZEN2, 0x01, _SE, R_MIZEN2,
0x11, _YO, R_MEIREI2, 0x11, _YO, R_MEIREI2,
0xff 0xff};
};
static u_char sahenmeisi2[] = { static u_char sahenmeisi2[] = {
0x00, R_SMEISI1, 0x00, R_SMEISI1,
@ -890,8 +835,7 @@ static u_char sahenmeisi2[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x01, _SE, R_MIZEN2, 0x01, _SE, R_MIZEN2,
0x11, _YO, R_MEIREI2, 0x11, _YO, R_MEIREI2,
0xff 0xff};
};
static u_char keidoumeisi[] = { static u_char keidoumeisi[] = {
0x00, R_DMEISI, 0x00, R_DMEISI,
@ -906,8 +850,7 @@ static u_char keidoumeisi[] = {
0x11, _RU, R_DRENTAI3, 0x11, _RU, R_DRENTAI3,
0x11, _RE, R_KAMEI, 0x11, _RE, R_KAMEI,
0x01, _NI, R_DRENYOU2, 0x01, _NI, R_DRENYOU2,
0xff 0xff};
};
static u_char keiyoustb[] = { static u_char keiyoustb[] = {
0x00, R_KSTB, 0x00, R_KSTB,
@ -917,8 +860,7 @@ static u_char keiyoustb[] = {
0x01, _KI, R_KRENTAI, 0x01, _KI, R_KRENTAI,
0x01, _KU, R_KRENYOU, 0x01, _KU, R_KRENYOU,
0x02, _KE, _RE, R_KATEI2, 0x02, _KE, _RE, R_KATEI2,
0xff 0xff};
};
static u_char ichistb[] = { static u_char ichistb[] = {
0x00, R_ICHISETUBI, 0x00, R_ICHISETUBI,
@ -926,16 +868,14 @@ static u_char ichistb[] = {
0x01, _RU, R_SHUUSI, 0x01, _RU, R_SHUUSI,
0x01, _RE, R_KATEI2, 0x01, _RE, R_KATEI2,
0x01, _RO, R_MEIREI1, 0x01, _RO, R_MEIREI1,
0xff 0xff};
};
static u_char fukusi2[] = { static u_char fukusi2[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
0x01, _TO, R_F_FUKUSI, 0x01, _TO, R_F_FUKUSI,
0x11, _SI, R_SI1, 0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI, 0x11, _HA, R_F_FUKUSI,
0xff 0xff};
};
static u_char fukusi3[] = { static u_char fukusi3[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
@ -950,8 +890,7 @@ static u_char fukusi3[] = {
0x01, _TO, R_F_FUKUSI, 0x01, _TO, R_F_FUKUSI,
0x11, _SI, R_SI1, 0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI, 0x11, _HA, R_F_FUKUSI,
0xff 0xff};
};
static u_char fukusi4[] = { static u_char fukusi4[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
@ -963,26 +902,22 @@ static u_char fukusi4[] = {
0x11, _RE, R_KATEI2, 0x11, _RE, R_KATEI2,
0x01, _SE, R_MIZEN2, 0x01, _SE, R_MIZEN2,
0x11, _YO, R_MEIREI2, 0x11, _YO, R_MEIREI2,
0xff 0xff};
};
static u_char fukusi5[] = { static u_char fukusi5[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
0x01, _NI, R_F_FUKUSI, 0x01, _NI, R_F_FUKUSI,
0xff 0xff};
};
static u_char fukusi6[] = { static u_char fukusi6[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
0x01, _MO, R_F_FUKUSI, 0x01, _MO, R_F_FUKUSI,
0xff 0xff};
};
static u_char fukusi7[] = { static u_char fukusi7[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
0x01, _NO, R_F_FUKUSI, 0x01, _NO, R_F_FUKUSI,
0xff 0xff};
};
static u_char fukusi8[] = { static u_char fukusi8[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
@ -995,8 +930,7 @@ static u_char fukusi8[] = {
0x01, _TO, R_F_FUKUSI, 0x01, _TO, R_F_FUKUSI,
0x11, _SI, R_SI1, 0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI, 0x11, _HA, R_F_FUKUSI,
0xff 0xff};
};
static u_char fukusi9[] = { static u_char fukusi9[] = {
0x00, R_FUKUSI, 0x00, R_FUKUSI,
@ -1018,10 +952,9 @@ static u_char fukusi9[] = {
0x11, _SI, R_SI1, 0x11, _SI, R_SI1,
0x11, _HA, R_F_FUKUSI, 0x11, _HA, R_F_FUKUSI,
0x01, _NO, R_F_FUKUSI, 0x01, _NO, R_F_FUKUSI,
0xff 0xff};
};
u_char *conjadr[] = { u_char* conjadr[] = {
0, 0,
0, 0,
0, 0,
@ -1241,5 +1174,4 @@ u_char *conjadr[] = {
0, 0,
0, 0,
0, 0,
0 0};
};

13049
lib/sj3core/connect.c
View file

File diff suppressed because it is too large Load diff

21
lib/sj3core/cvtclknj.c
View file

@ -33,36 +33,25 @@
* $SonyDate: 1994/06/03 08:01:38 $ * $SonyDate: 1994/06/03 08:01:38 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void cvtclknj() {
cvtclknj() KHREC* krec;
{
KHREC *krec;
int i; int i;
if(!selectid) selectid = khcount;
if (!selectid) selectid = khcount;
i = khcount; i = khcount;
krec = kouhotbl; krec = kouhotbl;
while (i--) { while(i--) {
if ((int)krec -> rank == (int)selectid) break; if((int)krec->rank == (int)selectid) break;
krec++; krec++;
} }
setstyrec(krec); setstyrec(krec);
cvtkouho(krec); cvtkouho(krec);
} }

124
lib/sj3core/cvtdict.c
View file

@ -33,51 +33,42 @@
* $SonyDate: 1994/06/03 08:01:40 $ * $SonyDate: 1994/06/03 08:01:40 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void cvtdict(KHREC* krec, CLREC* clrec, int flg) {
cvtdict(KHREC *krec, CLREC *clrec, int flg)
{
TypeDicOfs ofs; TypeDicOfs ofs;
u_char *yptr; u_char* yptr;
int jlen; int jlen;
int stblen; int stblen;
int sttlen; int sttlen;
u_char *fptr; u_char* fptr;
int cllen; int cllen;
JREC *jrec; JREC* jrec;
int i, j; int i, j;
ofs = krec->offs;
ofs = krec -> offs; jrec = clrec->jnode;
jrec = clrec -> jnode; cllen = clrec->cllen;
cllen = clrec -> cllen;
yptr = inputyomi; yptr = inputyomi;
jlen = jrec->jlen;
jlen = jrec -> jlen; if(i = jrec->sttofs) {
if(i == SETTOU_KIGOU) {
if (i = jrec -> sttofs) {
if (i == SETTOU_KIGOU) {
sttlen = 1; sttlen = 1;
fptr = yptr; fptr = yptr;
} }
else { else {
fptr = Settou_ptr(i); fptr = Settou_ptr(i);
sttlen = SttYomiLen(fptr); sttlen = SttYomiLen(fptr);
fptr++; fptr++;
if (!krec -> sttkj) fptr += 2; if(!krec->sttkj) fptr += 2;
} }
*kanjitmp++ = *fptr++; *kanjitmp++ = *fptr++;
@ -86,21 +77,17 @@ cvtdict(KHREC *krec, CLREC *clrec, int flg)
yptr += sttlen * 2; yptr += sttlen * 2;
} }
else else
sttlen = 0; sttlen = 0;
if(flg) {
if (flg) {
(*Cvtnum_func[krec->mode - 1])(ystart + sttlen, yptr, jrec); (*Cvtnum_func[krec->mode - 1])(ystart + sttlen, yptr, jrec);
yptr += (i = jrec->numlen) * 2;
yptr += (i = jrec -> numlen) * 2;
jlen -= i; jlen -= i;
if(jrec->stbofs) {
if (jrec -> stbofs) {
*kanjitmp++ = *yptr++; *kanjitmp++ = *yptr++;
*kanjitmp++ = *yptr++; *kanjitmp++ = *yptr++;
jlen--; jlen--;
@ -109,71 +96,60 @@ cvtdict(KHREC *krec, CLREC *clrec, int flg)
stblen = 0; stblen = 0;
} }
else if((i = jrec->stbofs) && (fptr = getstb(jrec->hinsi))) {
else if ((i = jrec -> stbofs) && (fptr = getstb(jrec -> hinsi))) {
fptr += i - 1; fptr += i - 1;
stblen = StbYomiLen(fptr); stblen = StbYomiLen(fptr);
jlen -= stblen; jlen -= stblen;
} }
else { else {
stblen = 0; stblen = 0;
} }
if(ofs) {
if (ofs) { if(seldict(jrec->dicid)) {
if (seldict(jrec -> dicid)) { (*curdict->getdic)(curdict, jrec->jseg);
(*curdict->getdic)(curdict, jrec -> jseg);
get_askknj(); get_askknj();
kanjitmp += kanjitmp +=
getkanji(yptr, jlen, dicbuf + ofs, kanjitmp); getkanji(yptr, jlen, dicbuf + ofs, kanjitmp);
yptr += jlen * 2; yptr += jlen * 2;
} } else {
else { while(jlen-- > 0) {
while (jlen-- > 0) { for(i = 0; i < euc_codesize(*yptr); i++)
for ( i = 0; i < euc_codesize(*yptr); i++)
*kanjitmp++ = yptr[i]; *kanjitmp++ = yptr[i];
yptr += euc_codesize(*yptr); yptr += euc_codesize(*yptr);
} }
} }
} }
if(stblen) {
if (stblen) {
i = StbKnjLen(fptr); i = StbKnjLen(fptr);
fptr += stblen + 2; fptr += stblen + 2;
while (i-- > 0) *kanjitmp++ = *fptr++; while(i-- > 0) *kanjitmp++ = *fptr++;
yptr += stblen * 2; yptr += stblen * 2;
} }
i = cllen - (jrec->jlen);
i = cllen - (jrec -> jlen); while(i-- > 0) {
while (i-- > 0) { for(j = 0; j < euc_codesize(*yptr); j++)
for ( j = 0; j < euc_codesize(*yptr); j++)
*kanjitmp++ = yptr[j]; *kanjitmp++ = yptr[j];
yptr += euc_codesize(*yptr); yptr += euc_codesize(*yptr);
} }
} }
void cvtminasi(int len) {
u_char* ptr;
void
cvtminasi(int len)
{
u_char *ptr;
ptr = inputyomi; ptr = inputyomi;
while (len-- > 0) { while(len-- > 0) {
if(isknj1(*ptr)) {
if (isknj1(*ptr)) {
*kanjitmp++ = *ptr++; *kanjitmp++ = *ptr++;
*kanjitmp++ = *ptr++; *kanjitmp++ = *ptr++;
} }
else if (*ptr == SS3) { else if(*ptr == SS3) {
*kanjitmp++ = *ptr++; *kanjitmp++ = *ptr++;
*kanjitmp++ = *ptr++; *kanjitmp++ = *ptr++;
*kanjitmp++ = *ptr++; *kanjitmp++ = *ptr++;
@ -183,40 +159,32 @@ cvtminasi(int len)
} }
} }
void cvtwakachi(CLREC* clrec) {
void
cvtwakachi(CLREC *clrec)
{
int jlen; int jlen;
u_char *ym; u_char* ym;
int cnt; int cnt;
u_char ch; u_char ch;
ym = inputyomi; ym = inputyomi;
cnt = jlen = clrec->jnode->jlen;
while(cnt-- > 0) {
if(isknj1(*ym)) {
cnt = jlen = clrec -> jnode -> jlen; if(*ym == 0xa4) {
while (cnt-- > 0) {
if (isknj1(*ym)) {
if (*ym == 0xa4) {
ch = *++ym; ch = *++ym;
if (0xa1 <= ch && ch <= 0xf3) { if(0xa1 <= ch && ch <= 0xf3) {
*kanjitmp++ = 0xa5; *kanjitmp++ = 0xa5;
} } else {
else {
*kanjitmp++ = 0xa4; *kanjitmp++ = 0xa4;
} }
*kanjitmp++ = ch; *kanjitmp++ = ch;
ym++; ym++;
} } else {
else {
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
} }
} } else if(*ym == SS3) {
else if (*ym == SS3) {
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
@ -225,17 +193,15 @@ cvtwakachi(CLREC *clrec)
} }
} }
cnt = clrec->cllen - jlen;
while(cnt-- > 0) {
cnt = clrec -> cllen - jlen; if(isknj1(*ym)) {
while (cnt-- > 0) {
if (isknj1(*ym)) {
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
} }
else if (*ym == SS3) { else if(*ym == SS3) {
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;
*kanjitmp++ = *ym++; *kanjitmp++ = *ym++;

129
lib/sj3core/cvtkanji.c
View file

@ -33,91 +33,70 @@
* $SonyDate: 1994/06/03 08:01:41 $ * $SonyDate: 1994/06/03 08:01:41 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void cvtphknj() {
cvtphknj()
{
int i, j; int i, j;
CLREC *clrec; CLREC* clrec;
CLREC *clkp; CLREC* clkp;
if (!kanjilen) goto not_enough_memory; if(!kanjilen) goto not_enough_memory;
khcount = 0; khcount = 0;
clkp = NULL; clkp = NULL;
stdytop = NULL; stdytop = NULL;
clrec = clt1st; clrec = clt1st;
while (clrec) { while(clrec) {
if (ph_khtbl(clrec)) clkp = clrec; if(ph_khtbl(clrec)) clkp = clrec;
clrec = clrec -> clsort; clrec = clrec->clsort;
} }
if(clkp && stdytop) {
if (clkp && stdytop) { if(stdytop->nmflg)
ph_setkouho(clkp, (TypeDicOfs)0, (STDYIN*)0);
if (stdytop -> nmflg)
ph_setkouho(clkp, (TypeDicOfs)0, (STDYIN *)0);
} }
kouhotbl[0].rank = 1; kouhotbl[0].rank = 1;
kanjitmp = kanjibuf + 1; kanjitmp = kanjibuf + 1;
setstyrec(kouhotbl); setstyrec(kouhotbl);
cvtkouho(kouhotbl); cvtkouho(kouhotbl);
i = kanjitmp - kanjibuf; i = kanjitmp - kanjibuf;
if (i < kanjilen) { if(i < kanjilen) {
kanjilen -= i; kanjilen -= i;
ystart += clt1st->cllen;
ystart += clt1st -> cllen; j = hzstrlen(inputyomi, (int)clt1st->cllen);
j = hzstrlen(inputyomi, (int)clt1st -> cllen);
kanjibuf[0] = (u_char)j; kanjibuf[0] = (u_char)j;
inputyomi += j; inputyomi += j;
memcpy(kanjipos, kanjibuf, i); memcpy(kanjipos, kanjibuf, i);
kanjipos += i; kanjipos += i;
} } else
else
kanjilen = 0; kanjilen = 0;
not_enough_memory: not_enough_memory:
free_clall(clt1st); free_clall(clt1st);
free_jall (jrt1st); free_jall(jrt1st);
} }
void cvtkouho(KHREC* krec) {
CLREC* clrec;
clrec = krec->clrec;
void switch(clrec->jnode->class) {
cvtkouho(KHREC *krec)
{
CLREC *clrec;
clrec = krec -> clrec;
switch (clrec -> jnode -> class) {
case C_DICT: case C_DICT:
cvtdict(krec, clrec, FALSE); cvtdict(krec, clrec, FALSE);
break; break;
@ -135,72 +114,62 @@ cvtkouho(KHREC *krec)
cvtdict(krec, clrec, TRUE); cvtdict(krec, clrec, TRUE);
break; break;
case C_BUNSETU : case C_BUNSETU:
case C_MINASI : case C_MINASI:
cvtminasi((int)clrec -> cllen); cvtminasi((int)clrec->cllen);
break; break;
case C_WAKACHI : case C_WAKACHI:
cvtwakachi(clrec); cvtwakachi(clrec);
break; break;
} }
*kanjitmp++ = 0; *kanjitmp++ = 0;
} }
void setstyrec(KHREC* krec) {
JREC* jrec;
void KHREC* kptr;
setstyrec(KHREC *krec)
{
JREC *jrec;
KHREC *kptr;
int ii; int ii;
u_char *fptr; u_char* fptr;
STDYOUT stdy; STDYOUT stdy;
jrec = krec -> clrec -> jnode; jrec = krec->clrec->jnode;
if(krec->mode && !krec->offs) {
if (krec -> mode && !krec -> offs) { for(ii = khcount, kptr = kouhotbl; ii--; kptr++)
if(kptr->rank == 1) break;
for (ii = khcount, kptr = kouhotbl ; ii--; kptr++) stdy.stdy1.offset = kptr->offs;
if (kptr -> rank == 1) break; stdy.stdy1.seg = kptr->clrec->jnode->jseg;
stdy.stdy1.styno = kptr->styno;
stdy.stdy1.dicid = kptr->clrec->jnode->dicid;
stdy.stdy1.offset = kptr -> offs;
stdy.stdy1.seg = kptr -> clrec -> jnode -> jseg;
stdy.stdy1.styno = kptr -> styno;
stdy.stdy1.dicid = kptr -> clrec -> jnode -> dicid;
stdy.stdy1.nmflg = 1; stdy.stdy1.nmflg = 1;
} }
else { else {
stdy.stdy1.offset = krec -> offs; stdy.stdy1.offset = krec->offs;
stdy.stdy1.seg = jrec -> jseg; stdy.stdy1.seg = jrec->jseg;
stdy.stdy1.styno = krec -> styno; stdy.stdy1.styno = krec->styno;
stdy.stdy1.dicid = jrec -> dicid; stdy.stdy1.dicid = jrec->dicid;
stdy.stdy1.nmflg = 0; stdy.stdy1.nmflg = 0;
} }
stdy.stdy1.sttkj = krec -> sttkj; stdy.stdy1.sttkj = krec->sttkj;
stdy.stdy1.ka_kj = krec -> ka_kj; stdy.stdy1.ka_kj = krec->ka_kj;
stdy.hinshi = jrec -> hinsi; stdy.hinshi = jrec->hinsi;
stdy.len = jrec -> jlen; stdy.len = jrec->jlen;
stdy.sttfg = krec -> sttfg; stdy.sttfg = krec->sttfg;
stdy.ka_fg = krec -> ka_fg; stdy.ka_fg = krec->ka_fg;
if(jrec->stbofs && (fptr = getstb(jrec->hinsi)))
stdy.len -= StbYomiLen(fptr + jrec->stbofs - 1);
if (jrec -> stbofs && (fptr = getstb(jrec -> hinsi))) if(fptr = Settou_ptr(jrec->sttofs))
stdy.len -= StbYomiLen(fptr + jrec -> stbofs - 1);
if (fptr = Settou_ptr(jrec -> sttofs))
stdy.sttlen = SttYomiLen(fptr); stdy.sttlen = SttYomiLen(fptr);
else else
stdy.sttlen = 0; stdy.sttlen = 0;
memcpy(kanjitmp, (u_char*)&stdy, sizeof(STDYOUT));
memcpy(kanjitmp, (u_char *)&stdy, sizeof(STDYOUT));
kanjitmp += sizeof(STDYOUT); kanjitmp += sizeof(STDYOUT);
} }

127
lib/sj3core/deldic.c
View file

@ -33,41 +33,35 @@
* $SonyDate: 1994/06/03 08:01:42 $ * $SonyDate: 1994/06/03 08:01:42 $
*/ */
#include <string.h> #include <string.h>
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static int del_douon(TypeDicSeg, u_char *, TypeDicOfs); static int del_douon(TypeDicSeg, u_char*, TypeDicOfs);
static int del_segment(TypeDicSeg); static int del_segment(TypeDicSeg);
static void del_uidx(TypeDicSeg); static void del_uidx(TypeDicSeg);
static void del_stdy(TypeDicSeg, TypeDicOfs, int); static void del_stdy(TypeDicSeg, TypeDicOfs, int);
u_int deldic(u_char* yomi, u_char* kanji, TypeGram hinsi) {
u_int
deldic(u_char *yomi, u_char *kanji, TypeGram hinsi)
{
u_char yptr[MAXWDYOMILEN + 1]; u_char yptr[MAXWDYOMILEN + 1];
u_char kptr[MAXWDKANJILEN + 1]; u_char kptr[MAXWDKANJILEN + 1];
u_short err; u_short err;
int knjlen; int knjlen;
TypeDicSeg useg; TypeDicSeg useg;
TypeDicOfs ofs; TypeDicOfs ofs;
u_char *p1, *p2, *p3; u_char * p1, *p2, *p3;
int dblknum; int dblknum;
int hblknum; int hblknum;
int kblknum; int kblknum;
int samlen; int samlen;
u_char *stp, *edp; u_char * stp, *edp;
int size, len; int size, len;
if (err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))) if(err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr)))
return err; return err;
if (!curdict -> maxunit) return AD_NOTUSERDICT; if(!curdict->maxunit) return AD_NOTUSERDICT;
knjlen = cvtknj(yomi, kanji, kptr); knjlen = cvtknj(yomi, kanji, kptr);
@ -77,32 +71,29 @@ deldic(u_char *yomi, u_char *kanji, TypeGram hinsi)
useg = srchidx((TypeDicSeg)DICSEGBASE, cnvlen); useg = srchidx((TypeDicSeg)DICSEGBASE, cnvlen);
(*curdict->getdic)(curdict, useg); (*curdict->getdic)(curdict, useg);
if (!(dblknum = srchkana(&p1, &samlen))) return AD_NOMIDASI; if(!(dblknum = srchkana(&p1, &samlen))) return AD_NOMIDASI;
if (!(hblknum = srchgram(p1, &p2, hinsi))) return AD_NOHINSI; if(!(hblknum = srchgram(p1, &p2, hinsi))) return AD_NOHINSI;
p3 = p2; p3 = p2;
kblknum = srchkanji(&p3, kptr, knjlen); kblknum = srchkanji(&p3, kptr, knjlen);
if (*p3 == HINSIBLKTERM) return AD_NOKANJI; if(*p3 == HINSIBLKTERM) return AD_NOKANJI;
ofs = p3 - dicbuf; ofs = p3 - dicbuf;
edp = skipkstr(p3); edp = skipkstr(p3);
if (kblknum == 1) { if(kblknum == 1) {
if (hblknum == 1) { if(hblknum == 1) {
if (dblknum == 1) { if(dblknum == 1) {
return del_segment(useg); return del_segment(useg);
} } else {
else {
return del_douon(useg, p1, ofs); return del_douon(useg, p1, ofs);
} }
} } else {
else {
stp = p2; stp = p2;
edp++; edp++;
} }
} } else {
else {
stp = p3; stp = p3;
} }
@ -124,30 +115,25 @@ deldic(u_char *yomi, u_char *kanji, TypeGram hinsi)
return AD_DONE; return AD_DONE;
} }
static int static int
del_douon(TypeDicSeg seg, u_char *ptr, TypeDicOfs ofs) del_douon(TypeDicSeg seg, u_char* ptr, TypeDicOfs ofs) {
{
u_char *nxt, *p1, *p2; u_char *nxt, *p1, *p2;
int size; int size;
int nlen, plen, len; int nlen, plen, len;
nxt = getntag(ptr); nxt = getntag(ptr);
if (segend(nxt)) { if(segend(nxt)) {
size = nxt - ptr; size = nxt - ptr;
memset(ptr, DICSEGTERM, dicbuf + curdict->seglen - nxt); memset(ptr, DICSEGTERM, dicbuf + curdict->seglen - nxt);
} } else {
else {
size = getsize(nxt); size = getsize(nxt);
nlen = getnlen(nxt); nlen = getnlen(nxt);
plen = getplen(nxt); plen = getplen(nxt);
if (ptr == segtop()) { if(ptr == segtop()) {
if (nlen + plen > (unsigned int) count_uidx() if(nlen + plen > (unsigned int)count_uidx() + sstrlen(get_idxptr(seg)))
+ sstrlen(get_idxptr(seg)))
return AD_OVFLWINDEX; return AD_OVFLWINDEX;
} }
@ -163,7 +149,7 @@ del_douon(TypeDicSeg seg, u_char *ptr, TypeDicOfs ofs)
size = p1 - p2; size = p1 - p2;
memset(dicbuf + curdict->seglen - size, DICSEGTERM, size); memset(dicbuf + curdict->seglen - size, DICSEGTERM, size);
if (ptr == segtop()) { if(ptr == segtop()) {
chg_uidx(seg, ptr + DOUONBLKSIZENUMBER, nlen + len); chg_uidx(seg, ptr + DOUONBLKSIZENUMBER, nlen + len);
} }
} }
@ -175,25 +161,21 @@ del_douon(TypeDicSeg seg, u_char *ptr, TypeDicOfs ofs)
return AD_DONE; return AD_DONE;
} }
static int static int
del_segment(TypeDicSeg seg) del_segment(TypeDicSeg seg) {
{
int i; int i;
STDYIN *styp; STDYIN* styp;
TypeDicID dicid; TypeDicID dicid;
TypeStyNum stdynum; TypeStyNum stdynum;
TypeDicSeg sg; TypeDicSeg sg;
if (curdict->segunit > 1) { if(curdict->segunit > 1) {
for (sg = seg + 1 ; sg < curdict->segunit ; sg++) { for(sg = seg + 1; sg < curdict->segunit; sg++) {
(*curdict->getdic)(curdict, sg); (*curdict->getdic)(curdict, sg);
(*curdict->putdic)(curdict, sg - 1); (*curdict->putdic)(curdict, sg - 1);
} }
curdict->segunit--; curdict->segunit--;
} } else {
else {
memset(dicbuf, DICSEGTERM, (int)curdict->seglen); memset(dicbuf, DICSEGTERM, (int)curdict->seglen);
dicbuf[0] = 0; dicbuf[0] = 0;
(*curdict->putdic)(curdict, DICSEGBASE); (*curdict->putdic)(curdict, DICSEGBASE);
@ -203,19 +185,19 @@ del_segment(TypeDicSeg seg)
del_uidx(seg); del_uidx(seg);
if (StudyExist()) { if(StudyExist()) {
dicid = curdict->dicid; dicid = curdict->dicid;
for (i = 0, styp = STUDYDICT ; i < STUDYCOUNT ; ) { for(i = 0, styp = STUDYDICT; i < STUDYCOUNT;) {
if (styp -> dicid != dicid) if(styp->dicid != dicid)
; ;
else if (styp -> seg > seg) else if(styp->seg > seg)
styp -> seg -= 1; styp->seg -= 1;
else if (styp -> seg < seg) else if(styp->seg < seg)
; ;
else { else {
stdynum = styp -> styno; stdynum = styp->styno;
STUDYCOUNT--; STUDYCOUNT--;
mvmemi((u_char *)(styp + 1), (u_char *)styp, mvmemi((u_char*)(styp + 1), (u_char*)styp,
sizeof(*styp) * (STUDYCOUNT - i)); sizeof(*styp) * (STUDYCOUNT - i));
continue; continue;
} }
@ -223,8 +205,8 @@ del_segment(TypeDicSeg seg)
i++; i++;
styp++; styp++;
} }
for (i = 0, styp = STUDYDICT ; i < STUDYCOUNT ; i++, styp++) for(i = 0, styp = STUDYDICT; i < STUDYCOUNT; i++, styp++)
if (styp -> styno > stdynum) styp -> styno -= 1; if(styp->styno > stdynum) styp->styno -= 1;
putstydic(); putstydic();
} }
@ -232,17 +214,13 @@ del_segment(TypeDicSeg seg)
return AD_DONE; return AD_DONE;
} }
static void static void
del_uidx(TypeDicSeg seg) del_uidx(TypeDicSeg seg) {
{
u_char *p, *q; u_char *p, *q;
int len; int len;
p = get_idxptr(seg); p = get_idxptr(seg);
for (q = p ; *q++; ) for(q = p; *q++;);
;
mvmemi(q, p, idxbuf + curdict->idxlen - q); mvmemi(q, p, idxbuf + curdict->idxlen - q);
@ -254,32 +232,29 @@ del_uidx(TypeDicSeg seg)
mkidxtbl(curdict); mkidxtbl(curdict);
} }
static void static void
del_stdy(TypeDicSeg seg, TypeDicOfs ofs, int size) del_stdy(TypeDicSeg seg, TypeDicOfs ofs, int size) {
{
int i; int i;
TypeStyNum stdynum; TypeStyNum stdynum;
STDYIN *stdy; STDYIN* stdy;
TypeDicID dicid; TypeDicID dicid;
if (StudyExist()) { if(StudyExist()) {
stdynum = 0; stdynum = 0;
dicid = curdict->dicid; dicid = curdict->dicid;
for (i = 0, stdy = STUDYDICT ; i < STUDYCOUNT ; ) { for(i = 0, stdy = STUDYDICT; i < STUDYCOUNT;) {
if (stdy -> dicid != dicid) if(stdy->dicid != dicid)
; ;
else if (stdy -> seg != seg) else if(stdy->seg != seg)
; ;
else if (stdy -> offset > ofs) else if(stdy->offset > ofs)
stdy -> offset -= size; stdy->offset -= size;
else if (stdy -> offset == ofs) { else if(stdy->offset == ofs) {
stdynum = stdy -> styno; stdynum = stdy->styno;
STUDYCOUNT--; STUDYCOUNT--;
mvmemi((u_char *)(stdy + 1), (u_char *)stdy, mvmemi((u_char*)(stdy + 1), (u_char*)stdy,
sizeof(*stdy) * (STUDYCOUNT - i)); sizeof(*stdy) * (STUDYCOUNT - i));
continue; continue;
} }
@ -287,8 +262,8 @@ del_stdy(TypeDicSeg seg, TypeDicOfs ofs, int size)
i++; i++;
stdy++; stdy++;
} }
for (i = 0, stdy = STUDYDICT ; i < STUDYCOUNT ; i++, stdy++) for(i = 0, stdy = STUDYDICT; i < STUDYCOUNT; i++, stdy++)
if (stdy -> styno > stdynum) (stdy -> styno)--; if(stdy->styno > stdynum) (stdy->styno)--;
putstydic(); putstydic();
} }

41
lib/sj3core/dict.c
View file

@ -33,21 +33,15 @@
* $SonyDate: 1994/06/03 08:01:45 $ * $SonyDate: 1994/06/03 08:01:45 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void get_askknj() {
void u_char* p;
get_askknj() u_char* q;
{ u_char* r;
u_char *p;
u_char *q;
u_char *r;
int i = 0, csize; int i = 0, csize;
int flg; int flg;
@ -55,34 +49,30 @@ get_askknj()
q += *p++; q += *p++;
while (p < q) { while(p < q) {
askknj[i] = p; askknj[i] = p;
r = NULL; r = NULL;
flg = TRUE; flg = TRUE;
do { do {
csize = codesize(*p); csize = codesize(*p);
if (p[csize] == KANJISTREND) flg = FALSE; if(p[csize] == KANJISTREND) flg = FALSE;
if (!r && (*p != AIATTRIBUTE)) if(!r && (*p != AIATTRIBUTE))
r = p; r = p;
p += csize; p += csize;
} while (flg); } while(flg);
p++; p++;
askknj_k[i++] = r; askknj_k[i++] = r;
} }
} }
int seldict(TypeDicID id) {
DICTL* dp;
for(dp = dictlist; dp; dp = dp->next) {
int if((curdict = dp->dict)->dicid == id)
seldict(TypeDicID id)
{
DICTL *dp;
for (dp = dictlist ; dp ; dp = dp -> next) {
if ((curdict = dp -> dict) -> dicid == id)
return TRUE; return TRUE;
} }
curdict = NULL; curdict = NULL;
@ -90,11 +80,8 @@ seldict(TypeDicID id)
return FALSE; return FALSE;
} }
u_char*
get_idxptr(TypeDicSeg seg) {
u_char *
get_idxptr(TypeDicSeg seg)
{
(*curdict->getofs)(curdict); (*curdict->getofs)(curdict);
(*curdict->getidx)(curdict); (*curdict->getidx)(curdict);

20
lib/sj3core/functbl.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:01:46 $ * $SonyDate: 1994/06/03 08:01:46 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
@ -45,31 +42,25 @@ VFunc cvtnum_func[] = {
num_type00, num_type01, num_type02, num_type03, num_type00, num_type01, num_type02, num_type03,
num_type04, num_type05, num_type06, num_type07, num_type04, num_type05, num_type06, num_type07,
num_type08, num_type09, num_type10, num_type11, num_type08, num_type09, num_type10, num_type11,
num_type12, num_type13, num_type14 num_type12, num_type13, num_type14};
};
UCPFunc getkan_func[] = { UCPFunc getkan_func[] = {
getkan_norm, getkan_norm, getkan_hira, getkan_kata, getkan_norm, getkan_norm, getkan_hira, getkan_kata,
getkan_knj, getkan_ofs, getkan_norm, getkan_none, getkan_knj, getkan_ofs, getkan_norm, getkan_none,
getkan_norm, getkan_norm, getkan_hira, getkan_kata, getkan_norm, getkan_norm, getkan_hira, getkan_kata,
getkan_knj, getkan_ofs, getkan_norm, getkan_none getkan_knj, getkan_ofs, getkan_norm, getkan_none};
};
IFunc setjrec_func[] = { IFunc setjrec_func[] = {
setj_norm2, setj_norm2, setj_norm1, setj_norm1, setj_norm2, setj_norm2, setj_norm1, setj_norm1,
setj_knj, setj_ofs, setj_norm2, setj_atrb, setj_knj, setj_ofs, setj_norm2, setj_atrb,
setj_norm2, setj_norm2, setj_norm1, setj_norm1, setj_norm2, setj_norm2, setj_norm1, setj_norm1,
setj_knj, setj_ofs, setj_norm2, setj_atrb setj_knj, setj_ofs, setj_norm2, setj_atrb};
};
IFunc hiraknj_func[] = { IFunc hiraknj_func[] = {
hiraknj_hira, hiraknj_norm, hiraknj_hask, hiraknj_kask, hiraknj_hira, hiraknj_norm, hiraknj_hask, hiraknj_kask,
hiraknj_knj, hiraknj_ofs, hiraknj_norm, hiraknj_atrb, hiraknj_knj, hiraknj_ofs, hiraknj_norm, hiraknj_atrb,
hiraknj_hira, hiraknj_norm, hiraknj_hask, hiraknj_kask, hiraknj_hira, hiraknj_norm, hiraknj_hask, hiraknj_kask,
hiraknj_knj, hiraknj_ofs, hiraknj_norm, hiraknj_atrb hiraknj_knj, hiraknj_ofs, hiraknj_norm, hiraknj_atrb};
};
u_char *makekan_1byte(), *makekan_knj(), *makekan_ofs(); u_char *makekan_1byte(), *makekan_knj(), *makekan_ofs();
u_char *makekan_norm(), *makekan_none(); u_char *makekan_norm(), *makekan_none();
@ -77,5 +68,4 @@ UCPFunc makekan_func[] = {
makekan_norm, makekan_norm, makekan_1byte, makekan_1byte, makekan_norm, makekan_norm, makekan_1byte, makekan_1byte,
makekan_knj, makekan_ofs, makekan_norm, makekan_none, makekan_knj, makekan_ofs, makekan_norm, makekan_none,
makekan_norm, makekan_norm, makekan_1byte, makekan_1byte, makekan_norm, makekan_norm, makekan_1byte, makekan_1byte,
makekan_knj, makekan_ofs, makekan_norm, makekan_none makekan_knj, makekan_ofs, makekan_norm, makekan_none};
};

191
lib/sj3core/fuzoku.c
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:01:47 $ * $SonyDate: 1994/06/03 08:01:47 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
#include "sj_right.h" #include "sj_right.h"
@ -45,31 +41,30 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
static int static int
fzkstrcmp(u_char *yptr, u_char *fzkp, int *saml) fzkstrcmp(u_char* yptr, u_char* fzkp, int* saml) {
{
int asklen, nkrlen; int asklen, nkrlen;
asklen = FzkAskLen(fzkp); asklen = FzkAskLen(fzkp);
if (*saml < asklen) return CONT; if(*saml < asklen) return CONT;
if (*saml > asklen) return OVER; if(*saml > asklen) return OVER;
nkrlen = FzkNkrLen(fzkp); nkrlen = FzkNkrLen(fzkp);
yptr += asklen; yptr += asklen;
fzkp ++; fzkp++;
while (nkrlen--) { while(nkrlen--) {
if (*yptr > *fzkp) if(*yptr > *fzkp)
return CONT; return CONT;
else if (*yptr < *fzkp) { else if(*yptr < *fzkp) {
if (!*yptr) return PARTLY; if(!*yptr) return PARTLY;
return OVER; return OVER;
} }
else{ else {
yptr++; yptr++;
fzkp++; fzkp++;
(*saml)++; (*saml)++;
@ -79,98 +74,90 @@ fzkstrcmp(u_char *yptr, u_char *fzkp, int *saml)
return MATCH; return MATCH;
} }
void setclrec(JREC* jrec, u_char* yptr, TypeCnct right) {
CLREC* new;
void
setclrec(JREC *jrec, u_char *yptr, TypeCnct right)
{
CLREC *new;
TypeGram hinsi; TypeGram hinsi;
int len; int len;
if (!(len = yptr - cnvstart)) return; if(!(len = yptr - cnvstart)) return;
if (len > MAXCLINPUTLEN) return; if(len > MAXCLINPUTLEN) return;
if (!(new = argclrec(len))) return; if(!(new = argclrec(len))) return;
new -> jnode = jrec; new->jnode = jrec;
new -> gobiln = gobilen; new->gobiln = gobilen;
new -> right = right; new->right = right;
new -> fzk_ka = fzk_ka_flg; new->fzk_ka = fzk_ka_flg;
(jrec -> count)++; (jrec->count)++;
hinsi = jrec -> hinsi; hinsi = jrec->hinsi;
if (hinsi >= DO_SAHEN && hinsi <= SP_KA_ONB) if(hinsi >= DO_SAHEN && hinsi <= SP_KA_ONB)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else if ((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) || else if((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) ||
(hinsi == SP_KEIYOUSI)){ (hinsi == SP_KEIYOUSI)) {
if(right == R_FZKMEISI) if(right == R_FZKMEISI)
new -> kubun = K_TAIGEN; new->kubun = K_TAIGEN;
else else
new -> kubun = K_YOUGEN; new->kubun = K_YOUGEN;
} }
else if (hinsi == RENTAISI) else if(hinsi == RENTAISI)
new -> kubun = K_RENTAISI; new->kubun = K_RENTAISI;
else if ((hinsi >= FUKUSI_1 && hinsi <= FUKUSI_9) || else if((hinsi >= FUKUSI_1 && hinsi <= FUKUSI_9) ||
(hinsi == SP_FUKUSI)) (hinsi == SP_FUKUSI))
new -> kubun = K_FUKUSI; new->kubun = K_FUKUSI;
else if (hinsi == SETUZOKU || hinsi==KANDOUSI || else if(hinsi == SETUZOKU || hinsi == KANDOUSI ||
hinsi == TANKANJI || hinsi==AISATU) hinsi == TANKANJI || hinsi == AISATU)
new -> kubun = K_SONOTA; new->kubun = K_SONOTA;
else if (gobilen) { else if(gobilen) {
if (hinsi >= MEISI_5 && hinsi <= MEISI_7) if(hinsi >= MEISI_5 && hinsi <= MEISI_7)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else if (hinsi == D_MEISI_4) else if(hinsi == D_MEISI_4)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else if (hinsi == SETUBI_7 || hinsi == SETUBI_8) else if(hinsi == SETUBI_7 || hinsi == SETUBI_8)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else if(hinsi == D_MEISI_5)
new->kubun = K_YOUGEN;
else if (hinsi == D_MEISI_5) else if(hinsi == SETUBI_5 || hinsi == SETUBI_6)
new -> kubun = K_YOUGEN; new->kubun = K_YOUGEN;
else if (hinsi == SETUBI_5 || hinsi == SETUBI_6)
new -> kubun = K_YOUGEN;
else else
new -> kubun = K_TAIGEN; new->kubun = K_TAIGEN;
} } else if(hinsi >= MEISI_5 && hinsi <= MEISI_7) {
else if (hinsi >= MEISI_5 && hinsi <= MEISI_7) { if(right >= R_I && right <= R_ITADAKE)
if (right >= R_I && right <= R_ITADAKE) new->kubun = K_DOUSHI;
new -> kubun = K_DOUSHI;
else if (right >= R_DESHI && right <= R_TAI) else if(right >= R_DESHI && right <= R_TAI)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else if (right >= R_NAI && right <= R_MEIREI2) else if(right >= R_NAI && right <= R_MEIREI2)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else if (right == R_TE2 || right == R_TERU) else if(right == R_TE2 || right == R_TERU)
new -> kubun = K_DOUSHI; new->kubun = K_DOUSHI;
else else
new -> kubun = K_TAIGEN; new->kubun = K_TAIGEN;
} } else
else new->kubun = K_TAIGEN;
new -> kubun = K_TAIGEN;
} }
static int static int
fzkcnct(TypeCnct right, TypeCnct left) fzkcnct(TypeCnct right, TypeCnct left) {
{ u_char* cncttbl;
u_char *cncttbl;
if (right && left) { if(right && left) {
cncttbl = Rigtadr(right); cncttbl = Rigtadr(right);
left--; left--;
if (cncttbl[left >> 3] << (left & 0x07) & 0x80) if(cncttbl[left >> 3] << (left & 0x07) & 0x80)
return TRUE; return TRUE;
} }
@ -178,92 +165,88 @@ fzkcnct(TypeCnct right, TypeCnct left)
} }
RECURS RECURS
void void srchfzk(JREC* jrec, u_char* yptr, TypeCnct right, int level) {
srchfzk(JREC *jrec, u_char *yptr, TypeCnct right, int level) u_char* fzk;
{
u_char *fzk;
int len = 0; int len = 0;
int cmp; int cmp;
u_char *next; u_char* next;
FREC *fzkrec; FREC* fzkrec;
int i; int i;
int nlen; int nlen;
TypeCnct rt; TypeCnct rt;
if ((level >= MAXFLVL) && !(Chrtbl[*yptr] & FZK_KGU)) return; if((level >= MAXFLVL) && !(Chrtbl[*yptr] & FZK_KGU)) return;
if (terminate(right, yptr) && Chrtbl[*yptr] & FZK_KGU){ if(terminate(right, yptr) && Chrtbl[*yptr] & FZK_KGU) {
if (!level) fzk_ka_flg = 0; if(!level) fzk_ka_flg = 0;
yptr++; yptr++;
while (Chrtbl[*yptr] & FZK_KGU) yptr++; while(Chrtbl[*yptr] & FZK_KGU) yptr++;
setclrec(jrec, yptr, (TypeCnct)R_FZKKGU); setclrec(jrec, yptr, (TypeCnct)R_FZKKGU);
return; return;
} }
if (right == R_CUT) return; if(right == R_CUT) return;
if (!*yptr) return; if(!*yptr) return;
if (!(*yptr >= _XA && *yptr <= _NN)) return; if(!(*yptr >= _XA && *yptr <= _NN)) return;
fzkrec = fzktbl; fzkrec = fzktbl;
for (i = fzkcount ; i ; i--, fzkrec++) { for(i = fzkcount; i; i--, fzkrec++) {
if (yptr != fzkrec -> yomip) continue; if(yptr != fzkrec->yomip) continue;
fzk = fzkrec -> fzkp; fzk = fzkrec->fzkp;
len = FzkAskLen(fzk) + (nlen = FzkNkrLen(fzk)) + 1; len = FzkAskLen(fzk) + (nlen = FzkNkrLen(fzk)) + 1;
if (!fzkcnct(right, (TypeCnct)FzkLeft(fzk))) continue; if(!fzkcnct(right, (TypeCnct)FzkLeft(fzk))) continue;
if (!level) fzk_ka_flg = FzkStrKa(fzk); if(!level) fzk_ka_flg = FzkStrKa(fzk);
next = yptr + len; next = yptr + len;
if (terminate(rt = FzkRight(fzk), next)) { if(terminate(rt = FzkRight(fzk), next)) {
setclrec(jrec, next, rt); setclrec(jrec, next, rt);
} }
srchfzk(jrec, next, rt, level + 1); srchfzk(jrec, next, rt, level + 1);
} }
if (len) return; if(len) return;
if(!(fzk = Fzkadr(*yptr - _XA))) return;
if (!(fzk = Fzkadr(*yptr - _XA))) return;
yptr++; yptr++;
for ( ; *fzk != FZKEND ; fzk += nlen + (i ? 4 : 3)) { for(; *fzk != FZKEND; fzk += nlen + (i ? 4 : 3)) {
nlen = FzkNkrLen(fzk); nlen = FzkNkrLen(fzk);
i = FzkHasCode(fzk); i = FzkHasCode(fzk);
cmp = fzkstrcmp(yptr, fzk, &len); cmp = fzkstrcmp(yptr, fzk, &len);
if (cmp == OVER) if(cmp == OVER)
break; break;
else if (cmp == PARTLY) else if(cmp == PARTLY)
break; break;
else if ((cmp != MATCH) || isdpnd(*(yptr + len))) else if((cmp != MATCH) || isdpnd(*(yptr + len)))
continue; continue;
fzktbl[fzkcount].yomip = yptr - 1; fzktbl[fzkcount].yomip = yptr - 1;
fzktbl[fzkcount].fzkp = fzk; fzktbl[fzkcount].fzkp = fzk;
fzkcount++; fzkcount++;
if (!fzkcnct(right, (TypeCnct)FzkLeft(fzk))) continue; if(!fzkcnct(right, (TypeCnct)FzkLeft(fzk))) continue;
if (!level) fzk_ka_flg = FzkStrKa(fzk); if(!level) fzk_ka_flg = FzkStrKa(fzk);
next = yptr + len; next = yptr + len;
if (terminate(rt = FzkRight(fzk), next)) { if(terminate(rt = FzkRight(fzk), next)) {
setclrec(jrec, next, rt); setclrec(jrec, next, rt);
} }

1152
lib/sj3core/fzkyomi.c
View file

File diff suppressed because it is too large Load diff

123
lib/sj3core/getkanji.c
View file

@ -33,42 +33,36 @@
* $SonyDate: 1994/06/03 08:01:49 $ * $SonyDate: 1994/06/03 08:01:49 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static u_char *code2kanji(); static u_char* code2kanji();
u_char * u_char*
getkan_none(u_char *s, u_char *d, u_char *ym, int yl, int flg) getkan_none(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
return d; return d;
} }
u_char * u_char*
getkan_hira(u_char *s, u_char *d, u_char *ym, int yl, int flg) getkan_hira(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
int cnt, csize; int cnt, csize;
csize = codesize(*s); csize = codesize(*s);
cnt = (*s & KANJICODEMASK) + 1; cnt = (*s & KANJICODEMASK) + 1;
if (flg && (s[csize] == KANJISTREND)) ym += (yl - cnt) * 2; if(flg && (s[csize] == KANJISTREND)) ym += (yl - cnt) * 2;
cnt *= 2; cnt *= 2;
while (cnt-- > 0) *d++ = *ym++; while(cnt-- > 0) *d++ = *ym++;
return d; return d;
} }
u_char * u_char*
getkan_kata(u_char *s, u_char *d, u_char *ym, int yl, int flg) getkan_kata(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
int cnt, csize; int cnt, csize;
u_char ch; u_char ch;
@ -76,21 +70,19 @@ getkan_kata(u_char *s, u_char *d, u_char *ym, int yl, int flg)
cnt = (*s & KANJICODEMASK) + 1; cnt = (*s & KANJICODEMASK) + 1;
if (flg && (s[csize] == KANJISTREND)) ym += (yl - cnt) * 2; if(flg && (s[csize] == KANJISTREND)) ym += (yl - cnt) * 2;
while (cnt-- > 0) { while(cnt-- > 0) {
if (*ym == 0xa4) { if(*ym == 0xa4) {
ch = *++ym; ch = *++ym;
if (0xa1 <= ch && ch <= 0xf3) { if(0xa1 <= ch && ch <= 0xf3) {
*d++ = 0xa5; *d++ = 0xa5;
} } else {
else {
*d++ = 0xa4; *d++ = 0xa4;
} }
*d++ = ch; *d++ = ch;
ym++; ym++;
} } else {
else {
*d++ = *ym++; *d++ = *ym++;
*d++ = *ym++; *d++ = *ym++;
} }
@ -99,29 +91,24 @@ getkan_kata(u_char *s, u_char *d, u_char *ym, int yl, int flg)
return d; return d;
} }
u_char * u_char*
getkan_knj(u_char *s, u_char *d, u_char *ym, int yl, int flg) getkan_knj(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
return code2kanji(askknj[*s & KNJASSYUKUMASK], d, ym, yl, flg); return code2kanji(askknj[*s & KNJASSYUKUMASK], d, ym, yl, flg);
} }
u_char*
getkan_ofs(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
u_char *
getkan_ofs(u_char *s, u_char *d, u_char *ym, int yl, int flg)
{
return code2kanji(dicbuf + ((*s & KANJICODEMASK) << 8) + *(s + 1), return code2kanji(dicbuf + ((*s & KANJICODEMASK) << 8) + *(s + 1),
d, ym, yl, flg); d, ym, yl, flg);
} }
u_char * u_char*
getkan_norm(u_char *s, u_char *d, u_char *ym, int yl, int flg) getkan_norm(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
u_char c; u_char c;
if (*s != 0) { if(*s != 0) {
c = s[1]; c = s[1];
if (c & 0x80) if(c & 0x80)
*d++ = SS3; *d++ = SS3;
*d++ = *s | 0x80; *d++ = *s | 0x80;
*d++ = c | 0x80; *d++ = c | 0x80;
@ -131,70 +118,79 @@ getkan_norm(u_char *s, u_char *d, u_char *ym, int yl, int flg)
return d; return d;
} }
u_char * u_char*
getkan_ascii(u_char *s, u_char *d, u_char *ym, int yl, int flg) getkan_ascii(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
u_char c; u_char c;
c = s[1]; c = s[1];
if (c & 0x80) if(c & 0x80)
*d++ = SS2; *d++ = SS2;
*d++ = c; *d++ = c;
return d; return d;
} }
static u_char * static u_char*
code2kanji(u_char *s, u_char *d, u_char *ym, int yl, int flg) code2kanji(u_char* s, u_char* d, u_char* ym, int yl, int flg) {
{
int csize; int csize;
for ( ; ; ) { for(;;) {
csize = codesize(*s); csize = codesize(*s);
if (s[csize] == KANJISTREND) { if(s[csize] == KANJISTREND) {
switch(*s & KANJIMODEMASK) { switch(*s & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
d = getkan_hira(s, d, ym, yl, flg); break; d = getkan_hira(s, d, ym, yl, flg);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
d = getkan_kata(s, d, ym, yl, flg); break; d = getkan_kata(s, d, ym, yl, flg);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
d = getkan_ofs(s, d, ym, yl, flg); break; d = getkan_ofs(s, d, ym, yl, flg);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
d = getkan_none(s, d, ym, yl, flg); break; d = getkan_none(s, d, ym, yl, flg);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
d = getkan_ascii(s, d, ym, yl, flg); break; d = getkan_ascii(s, d, ym, yl, flg);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
d = getkan_knj(s, d, ym, yl, flg); break; d = getkan_knj(s, d, ym, yl, flg);
break;
default: default:
d = getkan_norm(s, d, ym, yl, flg); d = getkan_norm(s, d, ym, yl, flg);
} }
break; break;
} } else
else
switch(*s & KANJIMODEMASK) { switch(*s & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
d = getkan_hira(s, d, ym, yl, FALSE); break; d = getkan_hira(s, d, ym, yl, FALSE);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
d = getkan_kata(s, d, ym, yl, FALSE); break; d = getkan_kata(s, d, ym, yl, FALSE);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
d = getkan_ofs(s, d, ym, yl, FALSE); break; d = getkan_ofs(s, d, ym, yl, FALSE);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
d = getkan_none(s, d, ym, yl, FALSE); break; d = getkan_none(s, d, ym, yl, FALSE);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
d = getkan_ascii(s, d, ym, yl, FALSE); break; d = getkan_ascii(s, d, ym, yl, FALSE);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
d = getkan_knj(s, d, ym, yl, FALSE); break; d = getkan_knj(s, d, ym, yl, FALSE);
break;
default: default:
d = getkan_norm(s, d, ym, yl, FALSE); d = getkan_norm(s, d, ym, yl, FALSE);
@ -206,15 +202,10 @@ code2kanji(u_char *s, u_char *d, u_char *ym, int yl, int flg)
return d; return d;
} }
int getkanji(u_char* ym, int yl, u_char* ptr, u_char* buf) {
u_char* q;
int
getkanji(u_char *ym, int yl, u_char *ptr, u_char *buf)
{
u_char *q;
q = code2kanji(ptr, buf, ym, yl, TRUE); q = code2kanji(ptr, buf, ym, yl, TRUE);
return q - buf; return q - buf;
} }

116
lib/sj3core/getrank.c
View file

@ -33,139 +33,104 @@
* $SonyDate: 1994/06/03 08:01:50 $ * $SonyDate: 1994/06/03 08:01:50 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static void setstynum(), setnspr(), regetrank(); static void setstynum(), setnspr(), regetrank();
void void getrank() {
getrank()
{
trank = nrank = 1; trank = nrank = 1;
setstynum(); setstynum();
regetrank(); regetrank();
} }
static void static void
setstynum() setstynum() {
{ KHREC* kptr;
KHREC *kptr; STDYIN* sptr;
STDYIN *sptr;
int count; int count;
for(kptr = kouhotbl, count = khcount; count--; kptr++) {
for (kptr = kouhotbl, count = khcount ; count-- ; kptr++) { sptr = srchstdy(kptr->clrec->jnode->jseg, kptr->offs,
kptr->clrec->jnode->dicid);
sptr = srchstdy(kptr -> clrec -> jnode -> jseg, kptr -> offs,
kptr -> clrec -> jnode -> dicid);
if (!sptr) continue;
if(!sptr) continue;
setnspr(kptr, sptr); setnspr(kptr, sptr);
} }
} }
static void static void
setnspr(KHREC *kptr, STDYIN *sptr) setnspr(KHREC* kptr, STDYIN* sptr) {
{ KHREC* ptr;
KHREC *ptr;
int keepnm; int keepnm;
TypeStyNum styno; TypeStyNum styno;
styno = kptr->styno = sptr->styno;
styno = kptr -> styno = sptr -> styno;
keepnm = trank; keepnm = trank;
for(ptr = kouhotbl; ptr < kptr; ptr++) {
for (ptr = kouhotbl ; ptr < kptr ; ptr++) { if(styno < ptr->styno) {
if (styno < ptr -> styno) {
ptr -> rank++;
ptr->rank++;
keepnm--; keepnm--;
} }
else if(styno == ptr->styno) {
else if (styno == ptr -> styno) { if(kptr->sttfg && kptr->ka_fg) {
if((sptr->sttkj == kptr->sttkj) &&
if (kptr -> sttfg && kptr -> ka_fg) { (sptr->ka_kj == kptr->ka_kj)) {
ptr->rank++;
if ((sptr -> sttkj == kptr -> sttkj) &&
(sptr -> ka_kj == kptr -> ka_kj)) {
ptr -> rank++;
keepnm--; keepnm--;
} }
} }
else if (kptr -> sttfg) { else if(kptr->sttfg) {
if(sptr->sttkj == kptr->sttkj) {
if (sptr -> sttkj == kptr -> sttkj) { ptr->rank++;
ptr -> rank++;
keepnm--; keepnm--;
} }
} }
else if (kptr -> ka_fg) { else if(kptr->ka_fg) {
if(sptr->ka_kj == kptr->ka_kj) {
if (sptr -> ka_kj == kptr -> ka_kj) { ptr->rank++;
ptr -> rank++;
keepnm--; keepnm--;
} }
} }
} }
} }
kptr->rank = (u_char)keepnm;
kptr -> rank = (u_char)keepnm;
trank++; trank++;
if(keepnm <= nrank) nrank++;
if (keepnm <= nrank) nrank++; if(sptr->nmflg && (nrank > keepnm)) nrank = keepnm;
if (sptr -> nmflg && (nrank > keepnm)) nrank = keepnm;
} }
static void static void
regetrank() regetrank() {
{ KHREC* kptr;
KHREC *kptr;
int count; int count;
int tmp; int tmp;
if(nrank < trank) {
if (nrank < trank) {
tmp = nrank; tmp = nrank;
trank += nkhcount; trank += nkhcount;
} }
@ -173,19 +138,16 @@ regetrank()
nkhcount = tmp = 0; nkhcount = tmp = 0;
} }
for(count = khcount, kptr = kouhotbl; count--; kptr++) {
for (count = khcount, kptr = kouhotbl ; count-- ; kptr++) { if(!(kptr->rank)) {
if(tmp && kptr->mode && !(kptr->offs)) {
if (!(kptr -> rank)) { kptr->rank = (u_char)tmp++;
if (tmp && kptr -> mode && !(kptr -> offs)) { } else
kptr -> rank = (u_char)tmp++; kptr->rank = (u_char)trank++;
}
else
kptr -> rank = (u_char)trank++;
} }
else if((short)kptr->rank >= nrank)
else if ((short)kptr -> rank >= nrank) kptr->rank += (u_char)nkhcount;
kptr -> rank += (u_char)nkhcount;
} }
} }

9
lib/sj3core/global.c
View file

@ -33,8 +33,6 @@
* $SonyDate: 1994/12/09 11:27:06 $ * $SonyDate: 1994/12/09 11:27:06 $
*/ */
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include "sj_rename.h" #include "sj_rename.h"
@ -48,11 +46,10 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
Global *global_work_base; Global* global_work_base;
Global *work_base; Global* work_base;
STDY *stdy_base; STDY* stdy_base;
int serv_errno; int serv_errno;

18
lib/sj3core/hzstrlen.c
View file

@ -41,28 +41,24 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int euc_codesize(u_char c) {
euc_codesize(u_char c) if((c & KANJIMODEMASK) == 0x90) {
{
if ((c & KANJIMODEMASK) == 0x90) {
return 1; return 1;
} else if (isknj1(c)) { } else if(isknj1(c)) {
return 2; return 2;
} else if (c == SS3) { } else if(c == SS3) {
return 3; return 3;
} else { } else {
return 1; return 1;
} }
} }
int int hzstrlen(u_char* ptr, int len) {
hzstrlen(u_char *ptr, int len) u_char* head;
{
u_char *head;
head = ptr; head = ptr;
while (len-- > 0) ptr += euc_codesize(*ptr); while(len-- > 0) ptr += euc_codesize(*ptr);
return (ptr - head); return (ptr - head);
} }

37
lib/sj3core/init.c
View file

@ -33,40 +33,34 @@
* $SonyDate: 1994/06/03 08:01:54 $ * $SonyDate: 1994/06/03 08:01:54 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void seg_count(DICT* dict) {
seg_count(DICT *dict) u_char* p;
{ u_char* q;
u_char *p;
u_char *q;
TypeDicSeg segcnt = 0; TypeDicSeg segcnt = 0;
if (dict-> getidx) { if(dict->getidx) {
(*dict->getidx)(dict); (*dict->getidx)(dict);
p = idxbuf; p = idxbuf;
q = p + dict->idxlen; q = p + dict->idxlen;
while (p < q && *p) { while(p < q && *p) {
segcnt++; segcnt++;
while (*p++) ; while(*p++);
} }
} }
dict->segunit = (segcnt == 0) ? 1 : segcnt; dict->segunit = (segcnt == 0) ? 1 : segcnt;
} }
void void mkidxtbl(DICT* dict) {
mkidxtbl(DICT *dict) u_char* p;
{
u_char *p;
TypeDicSeg seg; TypeDicSeg seg;
if (!dict->getidx || !dict->getofs) return; if(!dict->getidx || !dict->getofs) return;
seg = 0; seg = 0;
@ -74,16 +68,13 @@ mkidxtbl(DICT *dict)
(*dict->getofs)(dict); (*dict->getofs)(dict);
idxofs[0] = 0; idxofs[0] = 0;
for (p = idxbuf ; p < idxbuf + dict->idxlen && seg < dict->segunit ; ) { for(p = idxbuf; p < idxbuf + dict->idxlen && seg < dict->segunit;) {
idxofs[seg++] = p - idxbuf; idxofs[seg++] = p - idxbuf;
while (*p++) ; while(*p++);
} }
} }
void void initwork() {
initwork() jrt1st = jrt2nd = maxjptr = (JREC*)0;
{ clt1st = clt2nd = maxclptr = (CLREC*)0;
jrt1st = jrt2nd = maxjptr = (JREC *)0;
clt1st = clt2nd = maxclptr = (CLREC *)0;
} }

17
lib/sj3core/istrcmp.c
View file

@ -33,26 +33,22 @@
* $SonyDate: 1994/06/03 08:01:55 $ * $SonyDate: 1994/06/03 08:01:55 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_const.h" #include "sj_const.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int istrcmp(u_char* yomip, u_char* idxp, int ylen, int ilen) {
istrcmp(u_char *yomip, u_char *idxp, int ylen, int ilen) for(;;) {
{
for (;;) {
if ((ilen | ylen) == 0) return MATCH; if((ilen | ylen) == 0) return MATCH;
if (ilen == 0) return UNDER; if(ilen == 0) return UNDER;
if ((ylen == 0) || (*yomip < *idxp)) return OVER; if((ylen == 0) || (*yomip < *idxp)) return OVER;
if (*yomip > *idxp) return UNDER; if(*yomip > *idxp) return UNDER;
yomip++; yomip++;
idxp++; idxp++;
@ -60,4 +56,3 @@ istrcmp(u_char *yomip, u_char *idxp, int ylen, int ilen)
ilen--; ilen--;
} }
} }

88
lib/sj3core/memory.c
View file

@ -33,28 +33,24 @@
* $SonyDate: 1994/06/03 08:01:58 $ * $SonyDate: 1994/06/03 08:01:58 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
JREC * JREC* free_jlst(JREC* p) {
free_jlst(JREC *p) JREC* jpk;
{ JREC* jp;
JREC *jpk; JREC* jn;
JREC *jp;
JREC *jn;
jp = NULL; jp = NULL;
for ( ; p ; p = jn) { for(; p; p = jn) {
jn = p -> jsort; jn = p->jsort;
if (p -> count) { if(p->count) {
if (jp) if(jp)
jp -> jsort = p; jp->jsort = p;
else else
jpk = p; jpk = p;
jp = p; jp = p;
@ -65,36 +61,33 @@ free_jlst(JREC *p)
} }
} }
if (jp) jp -> jsort = NULL; if(jp) jp->jsort = NULL;
return jpk; return jpk;
} }
CLREC * CLREC*
free_clst(CLREC *p, int l) free_clst(CLREC* p, int l) {
{ CLREC* cpk;
CLREC *cpk; CLREC* cp;
CLREC *cp; CLREC* cn;
CLREC *cn;
cp = cpk = NULL; cp = cpk = NULL;
for ( ; p ; p = cn) { for(; p; p = cn) {
cn = p -> clsort; cn = p->clsort;
if ((int)p -> cllen == l) { if((int)p->cllen == l) {
if (p == selcl) { if(p == selcl) {
if (cp) { if(cp) {
p -> clsort = cpk; p->clsort = cpk;
cpk = p; cpk = p;
} } else
else
cpk = cp = p; cpk = cp = p;
} } else {
else { if(cp)
if (cp) cp->clsort = p;
cp -> clsort = p;
else else
cpk = p; cpk = p;
cp = p; cp = p;
@ -102,49 +95,42 @@ free_clst(CLREC *p, int l)
} }
else { else {
(p -> jnode -> count)--; (p->jnode->count)--;
free_clrec(p); free_clrec(p);
} }
} }
if (cp) cp -> clsort = NULL; if(cp) cp->clsort = NULL;
return cpk; return cpk;
} }
void void free_clall(CLREC* p) {
free_clall(CLREC *p) CLREC* next;
{
CLREC *next;
while (p) { while(p) {
(p -> jnode -> count)--; (p->jnode->count)--;
next = p -> clsort; next = p->clsort;
free_clrec(p); free_clrec(p);
p = next; p = next;
} }
} }
void void free_jall(JREC* p) {
free_jall(JREC *p) JREC* next;
{
JREC *next;
while (p) { while(p) {
next = p -> jsort; next = p->jsort;
free_jrec(p); free_jrec(p);
p = next; p = next;
} }
} }
void void freework() {
freework()
{
free_clall(maxclptr); free_clall(maxclptr);
clt1st = maxclptr = NULL; clt1st = maxclptr = NULL;
free_jall(maxjptr); free_jall(maxjptr);
jrt1st = maxjptr = NULL; jrt1st = maxjptr = NULL;
} }

64
lib/sj3core/mk2claus.c
View file

@ -33,42 +33,37 @@
* $SonyDate: 1994/06/03 08:02:00 $ * $SonyDate: 1994/06/03 08:02:00 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_right.h" #include "sj_right.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static int static int
set2nd(CLREC *clrec) set2nd(CLREC* clrec) {
{
CLREC *rec2; CLREC* rec2;
mkjiritu(DO_IKKATU | DO_CLSTUDY); mkjiritu(DO_IKKATU | DO_CLSTUDY);
mkbunsetu(); mkbunsetu();
if (!maxclptr) { if(!maxclptr) {
wakachi(); wakachi();
return clrec -> cllen; return clrec->cllen;
} }
for (rec2 = maxclptr ; rec2 ; rec2 = rec2 -> clsort) { for(rec2 = maxclptr; rec2; rec2 = rec2->clsort) {
if (terminate(rec2->right, cnvstart+rec2->cllen) != SHU) if(terminate(rec2->right, cnvstart + rec2->cllen) != SHU)
break; break;
} }
return rec2 ? (clrec -> cllen + rec2 -> cllen) : (clrec -> cllen); return rec2 ? (clrec->cllen + rec2->cllen) : (clrec->cllen);
} }
void void mk2claus() {
mk2claus() u_char* keepptr;
{
u_char *keepptr;
int keeplen; int keeplen;
CLREC *clrec; CLREC* clrec;
int len; int len;
int save2ln; int save2ln;
int prty; int prty;
@ -83,12 +78,12 @@ mk2claus()
selcl = clt1st; selcl = clt1st;
if (selcl -> right == R_FZKKGU) { if(selcl->right == R_FZKKGU) {
pritiny(); pritiny();
return; return;
} }
if (cnvlen == selcl -> cllen) { if(cnvlen == selcl->cllen) {
pritiny(); pritiny();
return; return;
} }
@ -97,13 +92,13 @@ mk2claus()
keeplen = cnvlen; keeplen = cnvlen;
len = count = 0; len = count = 0;
for (clrec = selcl ; clrec && count < 5 ; clrec = clrec -> clsort) { for(clrec = selcl; clrec && count < 5; clrec = clrec->clsort) {
cnvstart = keepptr + clrec -> cllen; cnvstart = keepptr + clrec->cllen;
cnvlen = keeplen - clrec -> cllen; cnvlen = keeplen - clrec->cllen;
if (len != clrec -> cllen) { if(len != clrec->cllen) {
if (clt2nd != maxclptr) { if(clt2nd != maxclptr) {
free_clall(maxclptr); free_clall(maxclptr);
free_jall(maxjptr); free_jall(maxjptr);
} }
@ -111,37 +106,37 @@ mk2claus()
save2ln = set2nd(clrec); save2ln = set2nd(clrec);
count++; count++;
len = clrec -> cllen; len = clrec->cllen;
prty2 = 0; prty2 = 0;
} }
if (Termtbl[clrec -> right] & T_SHUUJO) if(Termtbl[clrec->right] & T_SHUUJO)
clrec -> cl2len = (u_char)len; clrec->cl2len = (u_char)len;
else else
clrec -> cl2len = (u_char)save2ln; clrec->cl2len = (u_char)save2ln;
if (selcl -> cl2len > clrec -> cl2len) continue; if(selcl->cl2len > clrec->cl2len) continue;
prty = priority(clrec) - prty2; prty = priority(clrec) - prty2;
prty2++; prty2++;
if (selcl -> cl2len == clrec -> cl2len) { if(selcl->cl2len == clrec->cl2len) {
if (clrec -> cllen == nextcllen) { if(clrec->cllen == nextcllen) {
if (selcl -> cllen != nextcllen) if(selcl->cllen != nextcllen)
; ;
else if (prty <= maxprty) else if(prty <= maxprty)
continue; continue;
} }
else if (prty <= maxprty) else if(prty <= maxprty)
continue; continue;
} }
selcl = clrec; selcl = clrec;
maxprty = prty; maxprty = prty;
if (clt2nd == maxclptr) continue; if(clt2nd == maxclptr) continue;
free_clall(clt2nd); free_clall(clt2nd);
free_jall(jrt2nd); free_jall(jrt2nd);
@ -149,7 +144,7 @@ mk2claus()
clt2nd = maxclptr; clt2nd = maxclptr;
} }
if (clt2nd != maxclptr) { if(clt2nd != maxclptr) {
free_clall(maxclptr); free_clall(maxclptr);
maxclptr = NULL; maxclptr = NULL;
free_jall(maxjptr); free_jall(maxjptr);
@ -159,4 +154,3 @@ mk2claus()
cnvstart = keepptr; cnvstart = keepptr;
cnvlen = keeplen; cnvlen = keeplen;
} }

91
lib/sj3core/mkbunset.c
View file

@ -33,23 +33,19 @@
* $SonyDate: 1994/06/03 08:02:02 $ * $SonyDate: 1994/06/03 08:02:02 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void mkbunsetu() {
mkbunsetu() JREC* jrec;
{
JREC *jrec;
TypeGram hinsi; TypeGram hinsi;
u_char *cnj; u_char* cnj;
CREC crec[4]; CREC crec[4];
int count; int count;
TypeCnct right; TypeCnct right;
u_char *next; u_char* next;
int i; int i;
fzkcount = 0; fzkcount = 0;
@ -58,18 +54,18 @@ mkbunsetu()
jrec = maxjptr; jrec = maxjptr;
while (jrec) { while(jrec) {
if (jrec -> stbofs && (cnj = getstb(jrec -> hinsi))) if(jrec->stbofs && (cnj = getstb(jrec->hinsi)))
hinsi = StbHinsi(cnj + jrec -> stbofs - 1); hinsi = StbHinsi(cnj + jrec->stbofs - 1);
else else
hinsi = jrec -> hinsi; hinsi = jrec->hinsi;
if (right = Connadr[hinsi]) { if(right = Connadr[hinsi]) {
gobilen = 0; gobilen = 0;
next = cnvstart + jrec->jlen; next = cnvstart + jrec->jlen;
if (terminate(right, next)) { if(terminate(right, next)) {
fzk_ka_flg = 0; fzk_ka_flg = 0;
setclrec(jrec, next, right); setclrec(jrec, next, right);
} }
@ -77,15 +73,15 @@ mkbunsetu()
srchfzk(jrec, next, right, 0); srchfzk(jrec, next, right, 0);
} }
else if (count = setconj(hinsi, jrec, crec)) { else if(count = setconj(hinsi, jrec, crec)) {
for (i = count ; i-- > 0 ; ) { for(i = count; i-- > 0;) {
right = crec[i].right; right = crec[i].right;
gobilen = crec[i].len; gobilen = crec[i].len;
next = cnvstart + jrec->jlen + gobilen; next = cnvstart + jrec->jlen + gobilen;
if (terminate(right, next)) { if(terminate(right, next)) {
fzk_ka_flg = 0; fzk_ka_flg = 0;
setclrec(jrec, next, right); setclrec(jrec, next, right);
} }
@ -94,73 +90,68 @@ mkbunsetu()
} }
} }
jrec = jrec -> jsort; jrec = jrec->jsort;
} }
} }
CLREC*
CLREC * argclrec(int len) {
argclrec(int len) CLREC* ptr;
{ CLREC* rec;
CLREC *ptr; CLREC* child;
CLREC *rec;
CLREC *child;
rec = alloc_clrec(); rec = alloc_clrec();
if (!rec) { if(!rec) {
if (!maxclptr) if(!maxclptr)
return NULL; return NULL;
ptr = NULL; ptr = NULL;
rec = maxclptr; rec = maxclptr;
while (child = rec -> clsort) { while(child = rec->clsort) {
ptr = rec; ptr = rec;
rec = child; rec = child;
} }
if (len <= (int) rec -> cllen) if(len <= (int)rec->cllen)
return NULL; return NULL;
if (ptr) if(ptr)
ptr -> clsort = NULL; ptr->clsort = NULL;
else else
maxclptr = NULL; maxclptr = NULL;
if (rec -> jnode) (rec -> jnode)--; if(rec->jnode) (rec->jnode)--;
} }
memset((u_char *)rec, 0, sizeof(*rec)); memset((u_char*)rec, 0, sizeof(*rec));
rec -> cllen = rec -> cl2len = (u_char)len; rec->cllen = rec->cl2len = (u_char)len;
if (!maxclptr) { if(!maxclptr) {
maxclptr = rec; maxclptr = rec;
return rec; return rec;
} }
ptr = maxclptr; ptr = maxclptr;
if (((int)ptr -> cllen < len) || if(((int)ptr->cllen < len) ||
(((int)ptr -> cllen == len) && (((int)ptr->cllen == len) &&
(ptr -> jnode -> hinsi == TANKANJI))) { (ptr->jnode->hinsi == TANKANJI))) {
rec -> clsort = maxclptr; rec->clsort = maxclptr;
maxclptr = rec; maxclptr = rec;
return rec; return rec;
} }
while (child = ptr -> clsort) { while(child = ptr->clsort) {
if ((int)child -> cllen < len || if((int)child->cllen < len ||
((int)child -> cllen == len && ((int)child->cllen == len &&
child->jnode->hinsi == TANKANJI)){ child->jnode->hinsi == TANKANJI)) {
ptr -> clsort = rec; ptr->clsort = rec;
rec -> clsort = child; rec->clsort = child;
return rec; return rec;
} } else
else
ptr = child; ptr = child;
} }
ptr->clsort = rec;
ptr -> clsort = rec;
return rec; return rec;
} }

101
lib/sj3core/mkjiritu.c
View file

@ -33,7 +33,6 @@
* $SonyDate: 1994/06/03 08:02:03 $ * $SonyDate: 1994/06/03 08:02:03 $
*/ */
#include <string.h> #include <string.h>
#include "sj_kcnv.h" #include "sj_kcnv.h"
@ -41,13 +40,11 @@
static void dic_mu(), dic_cl(); static void dic_mu(), dic_cl();
void void mkjiritu(int mode) {
mkjiritu(int mode)
{
u_char chkind1; u_char chkind1;
u_char chkind2; u_char chkind2;
JREC *jrec; JREC* jrec;
u_char *stb; u_char* stb;
headcode = headlen = 0; headcode = headlen = 0;
@ -55,25 +52,25 @@ mkjiritu(int mode)
chkind1 = Chrtbl[*cnvstart]; chkind1 = Chrtbl[*cnvstart];
if (chkind1 & DICTOP) { if(chkind1 & DICTOP) {
dic_mu(mode); dic_mu(mode);
} }
if (mode & DO_CLSTUDY) dic_cl(); if(mode & DO_CLSTUDY) dic_cl();
srchnum(); srchnum();
if (srchhead() && cnvlen != headlen) { if(srchhead() && cnvlen != headlen) {
cnvstart += headlen; cnvstart += headlen;
cnvlen -= headlen; cnvlen -= headlen;
chkind2 = Chrtbl[*cnvstart]; chkind2 = Chrtbl[*cnvstart];
if (chkind2 & DICTOP) { if(chkind2 & DICTOP) {
dic_mu(mode); dic_mu(mode);
} }
if (headcode == SETTOU_DAI) { if(headcode == SETTOU_DAI) {
srchnum(); srchnum();
} }
@ -81,109 +78,105 @@ mkjiritu(int mode)
cnvlen += headlen; cnvlen += headlen;
} }
for (jrec = maxjptr ; jrec ; jrec = jrec -> jsort) { for(jrec = maxjptr; jrec; jrec = jrec->jsort) {
if (stb = getstb(jrec -> hinsi)) if(stb = getstb(jrec->hinsi))
setubi(jrec, stb); setubi(jrec, stb);
} }
} }
static void static void
dic_mu(int mode) dic_mu(int mode) {
{ u_char* tagp;
u_char *tagp; DICTL* dp;
DICTL *dp;
for (dp = dictlist ; dp ; dp = dp -> next) { for(dp = dictlist; dp; dp = dp->next) {
curdict = dp -> dict; curdict = dp->dict;
dicinl = 1; dicinl = 1;
dicsaml = 0; dicsaml = 0;
prevseg = -1; prevseg = -1;
while (tagp = srchdict(tagp)) setjrec(tagp, mode); while(tagp = srchdict(tagp)) setjrec(tagp, mode);
} }
} }
JREC * JREC* argjrec(int len, JREC* rec) {
argjrec(int len, JREC *rec) JREC* ptr;
{ JREC* jrec;
JREC *ptr; JREC* child;
JREC *jrec;
JREC *child;
jrec = alloc_jrec(); jrec = alloc_jrec();
if (!jrec) { if(!jrec) {
if (!maxjptr) return NULL; if(!maxjptr) return NULL;
ptr = NULL; ptr = NULL;
jrec = maxjptr; jrec = maxjptr;
while (child = jrec -> jsort) { while(child = jrec->jsort) {
ptr = jrec; ptr = jrec;
jrec = child; jrec = child;
} }
if (len <= (int) jrec -> jlen) return NULL; if(len <= (int)jrec->jlen) return NULL;
if (ptr) if(ptr)
ptr -> jsort = NULL; ptr->jsort = NULL;
else else
maxjptr = NULL; maxjptr = NULL;
} }
if (rec) if(rec)
memcpy((u_char *)jrec, (u_char *)rec, sizeof(JREC)); memcpy((u_char*)jrec, (u_char*)rec, sizeof(JREC));
else else
memset((u_char *)jrec, 0, sizeof(*jrec)); memset((u_char*)jrec, 0, sizeof(*jrec));
jrec -> jlen = (u_char)len; jrec->jlen = (u_char)len;
if (!maxjptr) { if(!maxjptr) {
maxjptr = jrec; maxjptr = jrec;
jrec -> jsort = NULL; jrec->jsort = NULL;
return jrec; return jrec;
} }
ptr = maxjptr; ptr = maxjptr;
if ((int)ptr -> jlen < len) { if((int)ptr->jlen < len) {
jrec -> jsort = maxjptr; jrec->jsort = maxjptr;
maxjptr = jrec; maxjptr = jrec;
return jrec; return jrec;
} }
while (child = ptr -> jsort) { while(child = ptr->jsort) {
if ((int)child -> jlen < len) break; if((int)child->jlen < len) break;
ptr = child; ptr = child;
} }
ptr -> jsort = jrec; ptr->jsort = jrec;
jrec -> jsort = child; jrec->jsort = child;
return jrec; return jrec;
} }
static void static void
dic_cl() dic_cl() {
{ u_char* p;
u_char *p;
u_short pos; u_short pos;
int len; int len;
int cmp; int cmp;
if (!StudyExist()) return; if(!StudyExist()) return;
if ((pos = CLSTUDYIDX[(short) *cnvstart / CLSTUDYSTEP]) != (u_short)-1) { if((pos = CLSTUDYIDX[(short)*cnvstart / CLSTUDYSTEP]) != (u_short)-1) {
for (p = CLSTUDYDICT + pos ; !iseocl(p) ; p = ClNextTag(p)) { for(p = CLSTUDYDICT + pos; !iseocl(p); p = ClNextTag(p)) {
cmp = sstrncmp(cnvstart, (u_char *)ClYomiPos(p), cmp = sstrncmp(cnvstart, (u_char*)ClYomiPos(p),
len = ClYomiLen(p)); len = ClYomiLen(p));
if (cmp == MATCH) { if(cmp == MATCH) {
if (!isdpnd(*(cnvstart + len))) { if(!isdpnd(*(cnvstart + len))) {
setcrec(p); setcrec(p);
} }
} }
else if (cmp == OVER) else if(cmp == OVER)
break; break;
} }
} }

285
lib/sj3core/mkkouho.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:02:04 $ * $SonyDate: 1994/06/03 08:02:04 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
@ -47,36 +44,31 @@
static void getkhtbl(), cl_kanji(); static void getkhtbl(), cl_kanji();
static int diffknj(); static int diffknj();
static void cl_numcmn(); static void cl_numcmn();
static u_char *makekan(); static u_char* makekan();
void void mkkouho() {
mkkouho() CLREC* clrec;
{
CLREC *clrec;
int keeplen; int keeplen;
khcount = nkhcount = 0; khcount = nkhcount = 0;
keeplen = clt1st -> cllen; keeplen = clt1st->cllen;
clrec = clt1st; clrec = clt1st;
do { do {
getkhtbl(clrec); getkhtbl(clrec);
clrec = clrec -> clsort; clrec = clrec->clsort;
} while (clrec && (keeplen == clrec -> cllen)); } while(clrec && (keeplen == clrec->cllen));
} }
static void static void
getkhtbl(CLREC *clrec) getkhtbl(CLREC* clrec) {
{ JREC* jrec;
JREC *jrec;
jrec = clrec -> jnode; jrec = clrec->jnode;
switch (jrec -> class) { switch(jrec->class) {
case C_DICT: case C_DICT:
cl_kanji(jrec, clrec); cl_kanji(jrec, clrec);
break; break;
@ -101,160 +93,146 @@ getkhtbl(CLREC *clrec)
} }
} }
static void static void
cl_kanji(JREC *jrec, CLREC *clrec) cl_kanji(JREC* jrec, CLREC* clrec) {
{ u_char* ptr;
u_char *ptr;
int kcount = khcount; int kcount = khcount;
if (seldict(jrec -> dicid)) { if(seldict(jrec->dicid)) {
(*curdict->getdic)(curdict, jrec -> jseg); (*curdict->getdic)(curdict, jrec->jseg);
ptr = dicbuf + jrec->jofsst + 1; ptr = dicbuf + jrec->jofsst + 1;
get_askknj(); get_askknj();
while (*ptr != HINSIBLKTERM) { while(*ptr != HINSIBLKTERM) {
if (diffknj(jrec, ptr, kcount)) { if(diffknj(jrec, ptr, kcount)) {
setkouho(clrec, (TypeDicOfs)(ptr - dicbuf), 0); setkouho(clrec, (TypeDicOfs)(ptr - dicbuf), 0);
} }
ptr = skipkstr(ptr); ptr = skipkstr(ptr);
} }
} } else {
else {
setkouho(clrec, (TypeDicOfs)1, 0); setkouho(clrec, (TypeDicOfs)1, 0);
} }
} }
u_char*
makekan_none(u_char* s, u_char* d, int flg) {
u_char *
makekan_none(u_char *s, u_char *d, int flg)
{
return d; return d;
} }
u_char*
makekan_1byte(u_char* s, u_char* d, int flg) {
u_char * if((*s & KANJIMODEMASK) == ZENHIRAASSYUKU)
makekan_1byte(u_char *s, u_char *d, int flg)
{
if ((*s & KANJIMODEMASK) == ZENHIRAASSYUKU)
*d++ = 0x10 | (*s & KNJASSYUKUMASK); *d++ = 0x10 | (*s & KNJASSYUKUMASK);
else else
*d++ = 0x90 | (*s & KNJASSYUKUMASK); *d++ = 0x90 | (*s & KNJASSYUKUMASK);
if (flg) *d++ = KANJISTREND; if(flg) *d++ = KANJISTREND;
return d; return d;
} }
u_char*
makekan_knj(u_char* s, u_char* d, int flg) {
u_char *
makekan_knj(u_char *s, u_char *d, int flg)
{
return makekan(askknj[*s & KNJASSYUKUMASK], d, flg); return makekan(askknj[*s & KNJASSYUKUMASK], d, flg);
} }
u_char* makekan_ofs(u_char* s, u_char* d, int flg) {
u_char *makekan_ofs(u_char *s, u_char *d, int flg)
{
return makekan(dicbuf + ((*s & KANJICODEMASK) << 8) + *(s + 1), return makekan(dicbuf + ((*s & KANJICODEMASK) << 8) + *(s + 1),
d, flg); d, flg);
} }
u_char*
makekan_norm(u_char* s, u_char* d, int flg) {
u_char *
makekan_norm(u_char *s, u_char *d, int flg)
{
u_char c; u_char c;
if (*s != 0) { if(*s != 0) {
c = s[1]; c = s[1];
if (c & 0x80) if(c & 0x80)
*d++ = SS3; *d++ = SS3;
*d++ = *s | 0x80; *d++ = *s | 0x80;
*d++ = c | 0x80; *d++ = c | 0x80;
} else { } else {
*d++ = *s; *d++ = *s;
} }
if (flg) *d++ = KANJISTREND; if(flg) *d++ = KANJISTREND;
return d; return d;
} }
u_char*
makekan_ascii(u_char* s, u_char* d, int flg) {
u_char *
makekan_ascii(u_char *s, u_char *d, int flg)
{
u_char c; u_char c;
c = s[1]; c = s[1];
if (c & 0x80) if(c & 0x80)
*d++ = SS2; *d++ = SS2;
*d++ = c; *d++ = c;
if (flg) *d++ = KANJISTREND; if(flg) *d++ = KANJISTREND;
return d; return d;
} }
static u_char*
makekan(u_char* s, u_char* d, int flg) {
static u_char *
makekan(u_char *s, u_char *d, int flg)
{
int csize; int csize;
for ( ; ; ) { for(;;) {
csize = codesize(*s); csize = codesize(*s);
if (s[csize] == KANJISTREND) { if(s[csize] == KANJISTREND) {
switch(*s & KANJIMODEMASK) { switch(*s & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
d = makekan_1byte(s, d, flg); break; d = makekan_1byte(s, d, flg);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
d = makekan_1byte(s, d, flg); break; d = makekan_1byte(s, d, flg);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
d = makekan_ofs(s, d, flg); break; d = makekan_ofs(s, d, flg);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
d = makekan_none(s, d, flg); break; d = makekan_none(s, d, flg);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
d = makekan_ascii(s, d, flg); break; d = makekan_ascii(s, d, flg);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
d = makekan_knj(s, d, flg); break; d = makekan_knj(s, d, flg);
break;
default: default:
d = makekan_norm(s, d, flg); d = makekan_norm(s, d, flg);
} }
break; break;
} } else
else
switch(*s & KANJIMODEMASK) { switch(*s & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
d = makekan_1byte(s, d, FALSE); break; d = makekan_1byte(s, d, FALSE);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
d = makekan_1byte(s, d, FALSE); break; d = makekan_1byte(s, d, FALSE);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
d = makekan_ofs(s, d, FALSE); break; d = makekan_ofs(s, d, FALSE);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
d = makekan_none(s, d, FALSE); break; d = makekan_none(s, d, FALSE);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
d = makekan_ascii(s, d, FALSE); break; d = makekan_ascii(s, d, FALSE);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
d = makekan_knj(s, d, FALSE); break; d = makekan_knj(s, d, FALSE);
break;
default: default:
d = makekan_norm(s, d, FALSE); d = makekan_norm(s, d, FALSE);
@ -265,40 +243,37 @@ makekan(u_char *s, u_char *d, int flg)
return d; return d;
} }
#define PEND 2 #define PEND 2
#define QEND 1 #define QEND 1
static int static int
sameknj(u_char *p, u_char plen, u_char *q, u_char qlen) sameknj(u_char* p, u_char plen, u_char* q, u_char qlen) {
{
int i; int i;
int j; int j;
int endf = 0; int endf = 0;
int brkf; int brkf;
do { do {
if ((i = euc_codesize(*p)) != euc_codesize(*q)) return FALSE; if((i = euc_codesize(*p)) != euc_codesize(*q)) return FALSE;
brkf = 0; brkf = 0;
for (j = 0; j < i; j++) { for(j = 0; j < i; j++) {
if (p[j] != q[j] ) { if(p[j] != q[j]) {
brkf = 1; brkf = 1;
break; break;
} }
} }
if (brkf) break; if(brkf) break;
if (p[i] == KANJISTREND) endf += PEND; if(p[i] == KANJISTREND) endf += PEND;
if (q[i] == KANJISTREND) endf += QEND; if(q[i] == KANJISTREND) endf += QEND;
p += i; p += i;
q += i; q += i;
} while (!endf); } while(!endf);
switch (endf) { switch(endf) {
case (PEND | QEND): case(PEND | QEND):
if (plen == qlen) return TRUE; if(plen == qlen) return TRUE;
break; break;
case PEND: case PEND:
@ -308,17 +283,17 @@ sameknj(u_char *p, u_char plen, u_char *q, u_char qlen)
p = q; p = q;
case QEND: case QEND:
if (p[euc_codesize(*p)] != KANJISTREND) break; if(p[euc_codesize(*p)] != KANJISTREND) break;
if ((*p & KANJIMODEMASK) != 0x10 ) break; if((*p & KANJIMODEMASK) != 0x10) break;
if (qlen != plen - (*p & KANJICODEMASK) - 1) break; if(qlen != plen - (*p & KANJICODEMASK) - 1) break;
return TRUE; return TRUE;
default: default:
if (q[euc_codesize(*q)] != KANJISTREND) break; if(q[euc_codesize(*q)] != KANJISTREND) break;
if (p[euc_codesize(*p)] != KANJISTREND) break; if(p[euc_codesize(*p)] != KANJISTREND) break;
if ((*q & KANJIMODEMASK) != 0x10 ) break; if((*q & KANJIMODEMASK) != 0x10) break;
if ((*p & KANJIMODEMASK) != 0x10 ) break; if((*p & KANJIMODEMASK) != 0x10) break;
if (plen - (*p & KANJICODEMASK) != qlen - (*q & KANJICODEMASK)) if(plen - (*p & KANJICODEMASK) != qlen - (*q & KANJICODEMASK))
break; break;
return TRUE; return TRUE;
} }
@ -328,75 +303,64 @@ sameknj(u_char *p, u_char plen, u_char *q, u_char qlen)
#undef PEND #undef PEND
#undef QEND #undef QEND
static int static int
diffknj(JREC *jrec, u_char *ptr, int num) diffknj(JREC* jrec, u_char* ptr, int num) {
{ KHREC* kptr;
KHREC *kptr; JREC* jptr;
JREC *jptr;
int i; int i;
u_char kbuf1[MAXWDKANJILEN]; u_char kbuf1[MAXWDKANJILEN];
u_char kbuf2[MAXWDKANJILEN]; u_char kbuf2[MAXWDKANJILEN];
if (jrec -> hinsi == TANKANJI) return TRUE; if(jrec->hinsi == TANKANJI) return TRUE;
makekan(ptr, kbuf1, TRUE); makekan(ptr, kbuf1, TRUE);
for (i = 0, kptr = kouhotbl ; i < num ; i++, kptr++) { for(i = 0, kptr = kouhotbl; i < num; i++, kptr++) {
if ((jptr = kptr -> clrec -> jnode) == jrec) if((jptr = kptr->clrec->jnode) == jrec)
return FALSE; return FALSE;
if (jptr -> hinsi == TANKANJI) continue; if(jptr->hinsi == TANKANJI) continue;
if (jptr -> class != jrec -> class) continue; if(jptr->class != jrec->class) continue;
if (jptr -> dicid != jrec -> dicid) continue; if(jptr->dicid != jrec->dicid) continue;
if (jptr -> jseg != jrec -> jseg) continue; if(jptr->jseg != jrec->jseg) continue;
if (jptr -> sttofs != jrec -> sttofs) continue; if(jptr->sttofs != jrec->sttofs) continue;
if (jptr -> stbofs != jrec -> stbofs) continue; if(jptr->stbofs != jrec->stbofs) continue;
makekan(dicbuf + kptr -> offs, kbuf2, TRUE); makekan(dicbuf + kptr->offs, kbuf2, TRUE);
if (sameknj(kbuf1, jrec -> jlen, kbuf2, jptr -> jlen)) if(sameknj(kbuf1, jrec->jlen, kbuf2, jptr->jlen))
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
static int static int
chrck_numtbl(u_short flg, u_short cond) chrck_numtbl(u_short flg, u_short cond) {
{
u_short must; u_short must;
if (cond = SelNumCond(cond)) { if(cond = SelNumCond(cond)) {
if (must = (cond & SELNUMMUST)) { if(must = (cond & SELNUMMUST)) {
if ((flg & must) != must) return FALSE; if((flg & must) != must) return FALSE;
cond &= ~must; cond &= ~must;
} }
if (cond && !(cond & flg)) return FALSE; if(cond && !(cond & flg)) return FALSE;
} }
return TRUE; return TRUE;
} }
int sel_sjmode(JREC* jrec) {
int
sel_sjmode(JREC *jrec)
{
u_short i; u_short i;
u_short *p; u_short* p;
u_short *q; u_short* q;
switch (jrec -> class) { switch(jrec->class) {
case C_N_ARABIA: case C_N_ARABIA:
case C_N_ARACMA: case C_N_ARACMA:
case C_N_KAZU: case C_N_KAZU:
@ -414,52 +378,47 @@ sel_sjmode(JREC *jrec)
return SELARB; return SELARB;
} }
while ((i = *p++) != SELNUMTERM) { while((i = *p++) != SELNUMTERM) {
if (chrck_numtbl(jrec -> flags, i)) break; if(chrck_numtbl(jrec->flags, i)) break;
} }
if (i == SELNUMTERM) i = *q; if(i == SELNUMTERM) i = *q;
return SelNumFunc(i); return SelNumFunc(i);
} }
static void static void
cl_numcmn(JREC *jrec, CLREC *clrec) cl_numcmn(JREC* jrec, CLREC* clrec) {
{ u_char* p;
u_char *p;
int i; int i;
u_short j; u_short j;
u_short *tbl; u_short* tbl;
p = cnvstart; p = cnvstart;
if ((i = jrec -> sttofs) == SETTOU_DAI) if((i = jrec->sttofs) == SETTOU_DAI)
p += SttYomiLen(Settou_ptr(i)); p += SttYomiLen(Settou_ptr(i));
else if (i == SETTOU_KIGOU) else if(i == SETTOU_KIGOU)
p++; p++;
if (jrec -> jofsst) { if(jrec->jofsst) {
i = sel_sjmode(jrec); i = sel_sjmode(jrec);
if (seldict(jrec -> dicid)) { if(seldict(jrec->dicid)) {
(*curdict->getdic)(curdict, jrec -> jseg); (*curdict->getdic)(curdict, jrec->jseg);
p = dicbuf + jrec->jofsst + 1; p = dicbuf + jrec->jofsst + 1;
while (*p != HINSIBLKTERM) { while(*p != HINSIBLKTERM) {
setkouho(clrec, (TypeDicOfs)(p - dicbuf), i); setkouho(clrec, (TypeDicOfs)(p - dicbuf), i);
p = skipkstr(p); p = skipkstr(p);
} }
} } else {
else {
setkouho(clrec, (TypeDicOfs)1, i); setkouho(clrec, (TypeDicOfs)1, i);
} }
} } else {
else {
tbl = Selsjadrs(jrec->class - C_N_ARABIA); tbl = Selsjadrs(jrec->class - C_N_ARABIA);
while ((j = *tbl++) != SELNUMTERM) { while((j = *tbl++) != SELNUMTERM) {
if (!chrck_numtbl(jrec -> flags, j)) continue; if(!chrck_numtbl(jrec->flags, j)) continue;
setkouho(clrec, (TypeDicOfs)0, (int)SelNumFunc(j)); setkouho(clrec, (TypeDicOfs)0, (int)SelNumFunc(j));
} }

197
lib/sj3core/mknumber.c
View file

@ -33,10 +33,6 @@
* $SonyDate: 1994/06/03 08:02:05 $ * $SonyDate: 1994/06/03 08:02:05 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
#include "sj_suuji.h" #include "sj_suuji.h"
@ -44,19 +40,18 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
static int static int
word2char(u_short wd, u_char *tbl, int keta, int flg) word2char(u_short wd, u_char* tbl, int keta, int flg) {
{
int mask; int mask;
int num; int num;
u_char *src; u_char* src;
for (mask = 0x1000 ; mask ; mask >>= 4) { for(mask = 0x1000; mask; mask >>= 4) {
switch (num = (unsigned int)wd / mask) { switch(num = (unsigned int)wd / mask) {
case 0: case 0:
break; break;
case _NUM0: case _NUM0:
if (!flg) break; if(!flg) break;
default: default:
src = tbl + (num - _NUM0) * 2; src = tbl + (num - _NUM0) * 2;
@ -64,12 +59,12 @@ word2char(u_short wd, u_char *tbl, int keta, int flg)
*kanjitmp++ = *src; *kanjitmp++ = *src;
flg = TRUE; flg = TRUE;
if (keta && !(keta % 3)) { if(keta && !(keta % 3)) {
*kanjitmp++ = COMMAHIGH; *kanjitmp++ = COMMAHIGH;
*kanjitmp++ = COMMALOW; *kanjitmp++ = COMMALOW;
} }
} }
if (keta) keta--; if(keta) keta--;
wd &= (mask - 1); wd &= (mask - 1);
} }
@ -77,138 +72,118 @@ word2char(u_short wd, u_char *tbl, int keta, int flg)
} }
static void static void
words2num(u_short *wd, u_char *tbl, int flgc) words2num(u_short* wd, u_char* tbl, int flgc) {
{
int i; int i;
int keta; int keta;
int flg; int flg;
u_char *kp = kanjitmp; u_char* kp = kanjitmp;
if (flgc) { if(flgc) {
keta = NUMKETALENGTH - 1; keta = NUMKETALENGTH - 1;
flg = FALSE; flg = FALSE;
} } else {
else {
keta = 0; keta = 0;
flg = TRUE; flg = TRUE;
} }
for (i = NUMWORDBUF ; i-- > 0 ; ) { for(i = NUMWORDBUF; i-- > 0;) {
flg = word2char(*(wd + i), tbl, keta, flg); flg = word2char(*(wd + i), tbl, keta, flg);
if (keta) keta -= 4; if(keta) keta -= 4;
} }
if (kp == kanjitmp) { if(kp == kanjitmp) {
*kanjitmp++ = *tbl++; *kanjitmp++ = *tbl++;
*kanjitmp++ = *tbl; *kanjitmp++ = *tbl;
} }
} }
void void num_type00(u_char* s1, u_char* s2, JREC* jrec) {
num_type00(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num1tbl, FALSE); words2num(num, Num1tbl, FALSE);
} }
void void num_type01(u_char* s1, u_char* s2, JREC* jrec) {
num_type01(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num1tbl, FALSE); words2num(num, Num1tbl, FALSE);
} }
void void num_type02(u_char* s1, u_char* s2, JREC* jrec) {
num_type02(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num1tbl, TRUE); words2num(num, Num1tbl, TRUE);
} }
void void num_type03(u_char* s1, u_char* s2, JREC* jrec) {
num_type03(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num2tbl, FALSE); words2num(num, Num2tbl, FALSE);
} }
void void num_type04(u_char* s1, u_char* s2, JREC* jrec) {
num_type04(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num2tbl, FALSE); words2num(num, Num2tbl, FALSE);
} }
void void num_type05(u_char* s1, u_char* s2, JREC* jrec) {
num_type05(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num2tbl, TRUE); words2num(num, Num2tbl, TRUE);
} }
void void num_type06(u_char* s1, u_char* s2, JREC* jrec) {
num_type06(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num3tbl, FALSE); words2num(num, Num3tbl, FALSE);
} }
void void num_type07(u_char* s1, u_char* s2, JREC* jrec) {
num_type07(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
words2num(num, Num3tbl, FALSE); words2num(num, Num3tbl, FALSE);
} }
static void static void
kan_num(u_short *wd, u_char *tbl1, u_char *tbl2) kan_num(u_short* wd, u_char* tbl1, u_char* tbl2) {
{
int ii; int ii;
u_short tmp; u_short tmp;
int mask; int mask;
int num; int num;
int flg; int flg;
u_char *kurai1; u_char* kurai1;
u_char *kurai2; u_char* kurai2;
u_char *src; u_char* src;
u_char *keep = kanjitmp; u_char* keep = kanjitmp;
kurai2 = Num6tbl - 2; kurai2 = Num6tbl - 2;
mask = 0; mask = 0;
wd += NUMWORDBUF - 1; wd += NUMWORDBUF - 1;
flg = FALSE; flg = FALSE;
for (ii = NUMKETALENGTH ; ii-- > 0 ; ) { for(ii = NUMKETALENGTH; ii-- > 0;) {
if (!mask) { if(!mask) {
if (flg) { if(flg) {
*kanjitmp++ = *kurai2++; *kanjitmp++ = *kurai2++;
*kanjitmp++ = *kurai2++; *kanjitmp++ = *kurai2++;
} } else
else
kurai2 += 2; kurai2 += 2;
mask = 0x1000; mask = 0x1000;
@ -217,106 +192,87 @@ kan_num(u_short *wd, u_char *tbl1, u_char *tbl2)
kurai1 = tbl2; kurai1 = tbl2;
} }
if ((num = (unsigned int)tmp / mask) > _NUM0) { if((num = (unsigned int)tmp / mask) > _NUM0) {
if ((num != _NUM1) || !*kurai1) { if((num != _NUM1) || !*kurai1) {
src = tbl1 + (num - _NUM0) * 2; src = tbl1 + (num - _NUM0) * 2;
*kanjitmp++ = *src++; *kanjitmp++ = *src++;
*kanjitmp++ = *src; *kanjitmp++ = *src;
} }
if (*kurai1) { if(*kurai1) {
*kanjitmp++ = *kurai1++; *kanjitmp++ = *kurai1++;
*kanjitmp++ = *kurai1++; *kanjitmp++ = *kurai1++;
} }
flg = TRUE; flg = TRUE;
} } else
else
kurai1 += 2; kurai1 += 2;
tmp &= (mask - 1); tmp &= (mask - 1);
mask >>= 4; mask >>= 4;
} }
if (kanjitmp == keep) { if(kanjitmp == keep) {
*kanjitmp++ = *tbl1++; *kanjitmp++ = *tbl1++;
*kanjitmp++ = *tbl1; *kanjitmp++ = *tbl1;
} }
} }
void void num_type08(u_char* s1, u_char* s2, JREC* jrec) {
num_type08(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
kan_num(num, Num2tbl, Num4tbl); kan_num(num, Num2tbl, Num4tbl);
} }
void void num_type09(u_char* s1, u_char* s2, JREC* jrec) {
num_type09(u_char *s1, u_char *s2, JREC *jrec)
{
u_short num[NUMWORDBUF]; u_short num[NUMWORDBUF];
setwdnum(s1, (int)jrec -> numlen, num); setwdnum(s1, (int)jrec->numlen, num);
kan_num(num, Num3tbl, Num5tbl); kan_num(num, Num3tbl, Num5tbl);
} }
void num_type10(u_char* s1, u_char* s2, JREC* jrec) {
void
num_type10(u_char *s1, u_char *s2, JREC *jrec)
{
int i; int i;
for (i = jrec -> numlen ; i > 0 ; i--) { for(i = jrec->numlen; i > 0; i--) {
if (Chrtbl[*s1++] & NUMBER) { if(Chrtbl[*s1++] & NUMBER) {
*kanjitmp++ = *s2++; *kanjitmp++ = *s2++;
*kanjitmp++ = *s2++; *kanjitmp++ = *s2++;
} } else
else
s2 += euc_codesize(*s2); s2 += euc_codesize(*s2);
} }
} }
void num_type11(u_char* s1, u_char* s2, JREC* jrec) {
void
num_type11(u_char *s1, u_char *s2, JREC *jrec)
{
int i; int i;
int j; int j;
i = j = jrec -> numlen; i = j = jrec->numlen;
if (!(Chrtbl[*(s1 + j - 4)] & NUMBER)) j -= (j - 1) / 4; if(!(Chrtbl[*(s1 + j - 4)] & NUMBER)) j -= (j - 1) / 4;
for ( ; i > 0 ; i--) { for(; i > 0; i--) {
if (Chrtbl[*s1++] & NUMBER) { if(Chrtbl[*s1++] & NUMBER) {
*kanjitmp++ = *s2++; *kanjitmp++ = *s2++;
*kanjitmp++ = *s2++; *kanjitmp++ = *s2++;
if (--j > 0) { if(--j > 0) {
if ((j % 3) == 0) { if((j % 3) == 0) {
*kanjitmp++ = COMMAHIGH; *kanjitmp++ = COMMAHIGH;
*kanjitmp++ = COMMALOW; *kanjitmp++ = COMMALOW;
} }
} }
} } else
else
s2 += euc_codesize(*s2); s2 += euc_codesize(*s2);
} }
} }
void num_type12(u_char* s1, u_char* s2, JREC* jrec) {
void
num_type12(u_char *s1, u_char *s2, JREC *jrec)
{
int i; int i;
int j; int j;
for (i = jrec -> numlen ; i > 0 ; i--) { for(i = jrec->numlen; i > 0; i--) {
if (Chrtbl[j = *s1++] & NUMBER) { if(Chrtbl[j = *s1++] & NUMBER) {
j = (j - N_0) * 2; j = (j - N_0) * 2;
*kanjitmp++ = Num2tbl[j]; *kanjitmp++ = Num2tbl[j];
*kanjitmp++ = Num2tbl[j + 1]; *kanjitmp++ = Num2tbl[j + 1];
@ -324,53 +280,42 @@ num_type12(u_char *s1, u_char *s2, JREC *jrec)
} }
} }
static void static void
num_kurai(u_char *p, int len, u_char *tbl) num_kurai(u_char* p, int len, u_char* tbl) {
{
int i; int i;
int j; int j;
u_char tmp; u_char tmp;
for (i = 0 ; i < len ; i++) { for(i = 0; i < len; i++) {
tmp = *p++; tmp = *p++;
*kanjitmp++ = tbl[j = ((tmp & 0x0f) - _NUM0) * 2]; *kanjitmp++ = tbl[j = ((tmp & 0x0f) - _NUM0) * 2];
*kanjitmp++ = tbl[j + 1]; *kanjitmp++ = tbl[j + 1];
if (j = ((tmp >> 4) & 3)) { if(j = ((tmp >> 4) & 3)) {
*kanjitmp++ = Num4tbl[j = (3 - j) * 2]; *kanjitmp++ = Num4tbl[j = (3 - j) * 2];
*kanjitmp++ = Num4tbl[j + 1]; *kanjitmp++ = Num4tbl[j + 1];
} }
if (j = ((tmp >> 6) & 3)) { if(j = ((tmp >> 6) & 3)) {
*kanjitmp++ = Num6tbl[j = (3 - j) * 2]; *kanjitmp++ = Num6tbl[j = (3 - j) * 2];
*kanjitmp++ = Num6tbl[j + 1]; *kanjitmp++ = Num6tbl[j + 1];
} }
} }
} }
void num_type13(u_char* s1, u_char* s2, JREC* jrec) {
void
num_type13(u_char *s1, u_char *s2, JREC *jrec)
{
u_char num[NUMKETALENGTH]; u_char num[NUMKETALENGTH];
int len; int len;
len = setucnum(s1, (int)jrec -> numlen, num); len = setucnum(s1, (int)jrec->numlen, num);
num_kurai(num, len, Num1tbl); num_kurai(num, len, Num1tbl);
} }
void num_type14(u_char* s1, u_char* s2, JREC* jrec) {
void
num_type14(u_char *s1, u_char *s2, JREC *jrec)
{
u_char num[NUMKETALENGTH]; u_char num[NUMKETALENGTH];
int len; int len;
len = setucnum(s1, (int)jrec -> numlen, num); len = setucnum(s1, (int)jrec->numlen, num);
num_kurai(num, len, Num2tbl); num_kurai(num, len, Num2tbl);
} }

9
lib/sj3core/mvmemd.c
View file

@ -33,16 +33,11 @@
* $SonyDate: 1994/06/03 08:02:05 $ * $SonyDate: 1994/06/03 08:02:05 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void mvmemd(u_char* src, u_char* dest, int len) {
mvmemd(u_char *src, u_char *dest, int len) while(len-- > 0) *(--dest) = *(--src);
{
while (len-- > 0) *(--dest) = *(--src);
} }

9
lib/sj3core/mvmemi.c
View file

@ -33,16 +33,11 @@
* $SonyDate: 1994/06/03 08:02:06 $ * $SonyDate: 1994/06/03 08:02:06 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void mvmemi(u_char* src, u_char* dest, int len) {
mvmemi(u_char *src, u_char *dest, int len) while(len-- > 0) *dest++ = *src++;
{
while (len-- > 0) *dest++ = *src++;
} }

159
lib/sj3core/peepdic.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1995/07/21 05:22:51 $ * $SonyDate: 1995/07/21 05:22:51 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
@ -46,11 +43,9 @@ static int next_kanji(), next_hinsi(), next_douon();
static void set_kanji(), set_buf(), add_yomi(); static void set_kanji(), set_buf(), add_yomi();
static void set_idxyomi(); static void set_idxyomi();
static void cd2sjh_chr(u_char ch, u_char *dst); static void cd2sjh_chr(u_char ch, u_char* dst);
int int getusr(u_char* buf) {
getusr(u_char *buf)
{
int nlen; int nlen;
peepyomi[0] = peepknj[0] = peepgrm = 0; peepyomi[0] = peepknj[0] = peepgrm = 0;
@ -60,7 +55,7 @@ getusr(u_char *buf)
peepdptr = segtop(); peepdptr = segtop();
if (segend(peepdptr)) return 0; if(segend(peepdptr)) return 0;
add_yomi(); add_yomi();
@ -78,13 +73,11 @@ getusr(u_char *buf)
return -1; return -1;
} }
int int nextusr(u_char* buf) {
nextusr(u_char *buf)
{
(*curdict->getdic)(curdict, peepidx); (*curdict->getdic)(curdict, peepidx);
get_askknj(); get_askknj();
if (next_kanji()) { if(next_kanji()) {
set_kanji(); set_kanji();
set_buf(buf); set_buf(buf);
@ -95,13 +88,11 @@ nextusr(u_char *buf)
return 0; return 0;
} }
int int prevusr(u_char* buf) {
prevusr(u_char *buf)
{
(*curdict->getdic)(curdict, peepidx); (*curdict->getdic)(curdict, peepidx);
get_askknj(); get_askknj();
if (prev_kanji()) { if(prev_kanji()) {
set_kanji(); set_kanji();
set_buf(buf); set_buf(buf);
@ -113,8 +104,7 @@ prevusr(u_char *buf)
} }
static void static void
set_kanji() set_kanji() {
{
int len; int len;
len = getkanji(peepyomi, getnlen(peepdptr) + getplen(peepdptr), len = getkanji(peepyomi, getnlen(peepdptr) + getplen(peepdptr),
@ -123,17 +113,16 @@ set_kanji()
} }
static void static void
set_buf(u_char *buf) set_buf(u_char* buf) {
{ u_char* p;
u_char *p;
int i, csize; int i, csize;
for (p = peepyomi ; *p ; ) *buf++ = *p++; for(p = peepyomi; *p;) *buf++ = *p++;
*buf++ = 0; *buf++ = 0;
for (p = peepknj ; *p ; ) { for(p = peepknj; *p;) {
csize = euc_codesize(*p); csize = euc_codesize(*p);
for (i = 0; i < csize; i++ ) *buf++ = *p++; for(i = 0; i < csize; i++) *buf++ = *p++;
} }
*buf++ = 0; *buf++ = 0;
@ -142,16 +131,15 @@ set_buf(u_char *buf)
} }
static int static int
prev_kanji() prev_kanji() {
{ u_char* p1;
u_char *p1; u_char* p2;
u_char *p2;
p1 = peephptr + 1; p1 = peephptr + 1;
if (peepkptr <= p1) return prev_hinsi(); if(peepkptr <= p1) return prev_hinsi();
p2 = peepkptr; p2 = peepkptr;
while (p1 < p2) { while(p1 < p2) {
peepkptr = p1; peepkptr = p1;
p1 = skipkstr(p1); p1 = skipkstr(p1);
} }
@ -160,19 +148,18 @@ prev_kanji()
} }
static int static int
prev_hinsi() prev_hinsi() {
{ u_char* p1;
u_char *p1; u_char* p2;
u_char *p2;
int nlen; int nlen;
nlen = getnlen(peepdptr); nlen = getnlen(peepdptr);
p1 = peepdptr + DOUONBLKSIZENUMBER + nlen; p1 = peepdptr + DOUONBLKSIZENUMBER + nlen;
if (peephptr <= p1) return prev_douon(); if(peephptr <= p1) return prev_douon();
p2 = peephptr; p2 = peephptr;
while (p1 < p2) { while(p1 < p2) {
peephptr = p1; peephptr = p1;
p1 = skiphblk(p1); p1 = skiphblk(p1);
} }
@ -180,7 +167,7 @@ prev_hinsi()
peepgrm = *peephptr; peepgrm = *peephptr;
p1 = peephptr + 1; p1 = peephptr + 1;
while (*p1 != HINSIBLKTERM) { while(*p1 != HINSIBLKTERM) {
peepkptr = p1; peepkptr = p1;
p1 = skipkstr(p1); p1 = skipkstr(p1);
@ -190,14 +177,13 @@ prev_hinsi()
} }
static int static int
prev_douon() prev_douon() {
{ u_char* p1;
u_char *p1; u_char* p2;
u_char *p2;
int nlen; int nlen;
if (peepdptr <= segtop()) { if(peepdptr <= segtop()) {
if (peepidx <= DICSEGBASE) return 0; if(peepidx <= DICSEGBASE) return 0;
(*curdict->getdic)(curdict, --peepidx); (*curdict->getdic)(curdict, --peepidx);
get_askknj(); get_askknj();
@ -211,9 +197,8 @@ prev_douon()
add_yomi(); add_yomi();
p1 = getntag(p1); p1 = getntag(p1);
} while (!segend(p1)); } while(!segend(p1));
} } else {
else {
set_idxyomi(); set_idxyomi();
p1 = segtop(); p1 = segtop();
@ -224,7 +209,7 @@ prev_douon()
add_yomi(); add_yomi();
p1 = getntag(p1); p1 = getntag(p1);
} while (p1 < p2); } while(p1 < p2);
} }
nlen = getnlen(peepdptr); nlen = getnlen(peepdptr);
@ -234,7 +219,7 @@ prev_douon()
do { do {
peephptr = p1; peephptr = p1;
p1 = skiphblk(p1); p1 = skiphblk(p1);
} while (p1 < p2); } while(p1 < p2);
peepgrm = *peephptr; peepgrm = *peephptr;
@ -243,19 +228,18 @@ prev_douon()
peepkptr = p1; peepkptr = p1;
p1 = skipkstr(p1); p1 = skipkstr(p1);
} while (*p1 != HINSIBLKTERM); } while(*p1 != HINSIBLKTERM);
return -1; return -1;
} }
static int static int
next_kanji() next_kanji() {
{ u_char* p1;
u_char *p1;
p1 = skipkstr(peepkptr); p1 = skipkstr(peepkptr);
if (*p1 == HINSIBLKTERM) return next_hinsi(); if(*p1 == HINSIBLKTERM) return next_hinsi();
peepkptr = p1; peepkptr = p1;
@ -263,13 +247,12 @@ next_kanji()
} }
static int static int
next_hinsi() next_hinsi() {
{ u_char* p1;
u_char *p1;
p1 = skiphblk(peephptr); p1 = skiphblk(peephptr);
if (p1 >= getntag(peepdptr)) return next_douon(); if(p1 >= getntag(peepdptr)) return next_douon();
peephptr = p1; peephptr = p1;
@ -281,25 +264,22 @@ next_hinsi()
} }
static int static int
next_douon() next_douon() {
{ u_char* p1;
u_char *p1;
int nlen; int nlen;
p1 = getntag(peepdptr); p1 = getntag(peepdptr);
if (segend(p1)) { if(segend(p1)) {
if (peepidx + 1 < curdict->segunit) { if(peepidx + 1 < curdict->segunit) {
(*curdict->getdic)(curdict, ++peepidx); (*curdict->getdic)(curdict, ++peepidx);
get_askknj(); get_askknj();
peepdptr = segtop(); peepdptr = segtop();
set_idxyomi(); set_idxyomi();
} } else
else
return 0; return 0;
} } else {
else {
peepdptr = p1; peepdptr = p1;
} }
@ -316,13 +296,12 @@ next_douon()
} }
static void static void
set_idxyomi() set_idxyomi() {
{
u_char *p1, *p2; u_char *p1, *p2;
if (p2 = get_idxptr(peepidx)) { if(p2 = get_idxptr(peepidx)) {
p1 = peepyomi; p1 = peepyomi;
while (*p2) { while(*p2) {
cd2sjh_chr(*p2++, p1); cd2sjh_chr(*p2++, p1);
p1 += 2; p1 += 2;
} }
@ -331,8 +310,7 @@ set_idxyomi()
} }
static void static void
add_yomi() add_yomi() {
{
int nlen; int nlen;
u_char *p1, *p2; u_char *p1, *p2;
@ -342,7 +320,7 @@ add_yomi()
p2 = peepdptr + DOUONBLKSIZENUMBER; p2 = peepdptr + DOUONBLKSIZENUMBER;
while (nlen--) { while(nlen--) {
cd2sjh_chr(*p2++, p1); cd2sjh_chr(*p2++, p1);
p1 += 2; p1 += 2;
} }
@ -351,46 +329,35 @@ add_yomi()
} }
static void static void
cd2sjh_chr(u_char ch, u_char *dst) cd2sjh_chr(u_char ch, u_char* dst) {
{ if(ch == _TYOUON) {
if (ch == _TYOUON) {
*dst++ = 0xa1; *dst++ = 0xa1;
*dst++ = 0xbc; *dst++ = 0xbc;
} } else if(ch == _IGETA) {
else if (ch == _IGETA) {
*dst++ = 0xa1; *dst++ = 0xa1;
*dst++ = 0xf4; *dst++ = 0xf4;
} } else if(ch == _ATTO) {
else if (ch == _ATTO) {
*dst++ = 0xa1; *dst++ = 0xa1;
*dst++ = 0xf7; *dst++ = 0xf7;
} } else if(ch == _YUUBIN) {
else if (ch == _YUUBIN) {
*dst++ = 0xa2; *dst++ = 0xa2;
*dst++ = 0xa9; *dst++ = 0xa9;
} } else if(ch < N_0) {
else if (ch < N_0) { } else if(ch <= N_9) {
}
else if (ch <= N_9) {
*dst++ = 0xa3; *dst++ = 0xa3;
*dst++ = ch + 0xa0; *dst++ = ch + 0xa0;
} } else if(ch <= A_Z) {
else if (ch <= A_Z) {
*dst++ = 0xa3; *dst++ = 0xa3;
*dst++ = ch + 0xa7; *dst++ = ch + 0xa7;
} } else if(ch <= A_z) {
else if (ch <= A_z) {
*dst++ = 0xa3; *dst++ = 0xa3;
*dst++ = ch + 0xad; *dst++ = ch + 0xad;
} } else if(ch <= _NN) {
else if (ch <= _NN) {
*dst++ = 0xa4; *dst++ = 0xa4;
*dst++ = ch + 0x53; *dst++ = ch + 0x53;
} } else if(ch <= _XKE) {
else if (ch <= _XKE) {
*dst++ = 0xa5; *dst++ = 0xa5;
*dst++ = ch + 0x53; *dst++ = ch + 0x53;
} } else {
else {
} }
} }

43
lib/sj3core/ph2knj.c
View file

@ -33,24 +33,21 @@
* $SonyDate: 1994/06/03 08:02:09 $ * $SonyDate: 1994/06/03 08:02:09 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int ph2knj(u_char* zyomi, u_char* kanji, int knjlen) {
ph2knj(u_char *zyomi, u_char *kanji, int knjlen) u_char* ptr;
{ u_char* dst;
u_char *ptr;
u_char *dst;
int i; int i;
for (ptr = zyomi, dst = hyomi, i = 0 ; *ptr ; ) { for(ptr = zyomi, dst = hyomi, i = 0; *ptr;) {
if (i++ >= MAXPHINPUTLEN) { *kanji = 0; return 0; } if(i++ >= MAXPHINPUTLEN) {
*kanji = 0;
return 0;
}
ptr += sj2cd_chr(ptr, dst++); ptr += sj2cd_chr(ptr, dst++);
} }
*dst = 0; *dst = 0;
@ -69,13 +66,13 @@ ph2knj(u_char *zyomi, u_char *kanji, int knjlen)
kanjipos = kanji; kanjipos = kanji;
kanjilen = knjlen; kanjilen = knjlen;
while (cnvlen && kanjilen) { while(cnvlen && kanjilen) {
if (!clt1st) { if(!clt1st) {
mkjiritu(DO_CLSTUDY | DO_IKKATU); mkjiritu(DO_CLSTUDY | DO_IKKATU);
mkbunsetu(); mkbunsetu();
if (!maxclptr) wakachi(); if(!maxclptr) wakachi();
jrt1st = maxjptr; jrt1st = maxjptr;
clt1st = maxclptr; clt1st = maxclptr;
@ -85,14 +82,14 @@ ph2knj(u_char *zyomi, u_char *kanji, int knjlen)
selclrec(); selclrec();
prevclgrm = selcl -> jnode -> hinsi; prevclgrm = selcl->jnode->hinsi;
prevclrow = selcl -> right; prevclrow = selcl->right;
clt1st = free_clst(clt1st, (int)selcl -> cllen); clt1st = free_clst(clt1st, (int)selcl->cllen);
jrt1st = free_jlst(jrt1st); jrt1st = free_jlst(jrt1st);
cnvstart += selcl -> cllen; cnvstart += selcl->cllen;
cnvlen -= selcl -> cllen; cnvlen -= selcl->cllen;
cvtphknj(); cvtphknj();
@ -100,14 +97,12 @@ ph2knj(u_char *zyomi, u_char *kanji, int knjlen)
jrt1st = jrt2nd; jrt1st = jrt2nd;
} }
if (!kanjilen) { if(!kanjilen) {
free_clall(clt1st); free_clall(clt1st);
free_jall (jrt1st); free_jall(jrt1st);
} }
*kanjipos = 0; *kanjipos = 0;
return(inputyomi - zyomi); return (inputyomi - zyomi);
} }

49
lib/sj3core/ph_khtbl.c
View file

@ -38,55 +38,52 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
static void static void
ph_setsty(CLREC *clrec) ph_setsty(CLREC* clrec) {
{ JREC* jrec;
JREC *jrec;
TypeDicOfs offset; TypeDicOfs offset;
u_char *ptr; u_char* ptr;
STDYIN *sptr; STDYIN* sptr;
if (!seldict((jrec = clrec -> jnode) -> dicid)) { if(!seldict((jrec = clrec->jnode)->dicid)) {
if (!khcount) if(!khcount)
ph_setkouho(clrec, (TypeDicOfs)1, (STDYIN *)NULL); ph_setkouho(clrec, (TypeDicOfs)1, (STDYIN*)NULL);
return; return;
} }
(*curdict->getdic)(curdict, jrec -> jseg); (*curdict->getdic)(curdict, jrec->jseg);
ptr = dicbuf + jrec->jofsst + 1; ptr = dicbuf + jrec->jofsst + 1;
for ( ; *ptr != HINSIBLKTERM ; ptr = skipkstr(ptr)) { for(; *ptr != HINSIBLKTERM; ptr = skipkstr(ptr)) {
offset = ptr - dicbuf; offset = ptr - dicbuf;
sptr = srchstdy(jrec -> jseg, offset, jrec -> dicid); sptr = srchstdy(jrec->jseg, offset, jrec->dicid);
if (!khcount){ if(!khcount) {
ph_setkouho(clrec, offset, sptr); ph_setkouho(clrec, offset, sptr);
continue; continue;
} }
if (!sptr) continue; if(!sptr) continue;
if (sptr -> styno < kouhotbl[0].styno) { if(sptr->styno < kouhotbl[0].styno) {
ph_setkouho(clrec, offset, sptr); ph_setkouho(clrec, offset, sptr);
} }
else if (sptr -> styno == kouhotbl -> styno) { else if(sptr->styno == kouhotbl->styno) {
if (!(kouhotbl[0].ka_fg && if(!(kouhotbl[0].ka_fg &&
sptr -> ka_kj == kouhotbl[0].ka_kj)) { sptr->ka_kj == kouhotbl[0].ka_kj)) {
ph_setkouho(clrec, offset, sptr); ph_setkouho(clrec, offset, sptr);
} }
} }
} }
} }
int int ph_khtbl(CLREC* clrec) {
ph_khtbl(CLREC *clrec) JREC* jrec;
{
JREC *jrec;
int flg = FALSE; int flg = FALSE;
switch((jrec = clrec -> jnode) -> class) { switch((jrec = clrec->jnode)->class) {
case C_DICT: case C_DICT:
ph_setsty(clrec); ph_setsty(clrec);
break; break;
@ -101,19 +98,17 @@ ph_khtbl(CLREC *clrec)
case C_N_KAZULONG: case C_N_KAZULONG:
case C_N_KAZULCMA: case C_N_KAZULCMA:
case C_N_SUUJILONG: case C_N_SUUJILONG:
if (jrec -> jofsst) { if(jrec->jofsst) {
ph_setsty(clrec); ph_setsty(clrec);
break; break;
} } else
else
flg = TRUE; flg = TRUE;
case C_BUNSETU: case C_BUNSETU:
case C_MINASI: case C_MINASI:
case C_WAKACHI: case C_WAKACHI:
if (!khcount) ph_setkouho(clrec, (TypeDicOfs)0, (STDYIN *)0); if(!khcount) ph_setkouho(clrec, (TypeDicOfs)0, (STDYIN*)0);
break; break;
} }
return flg; return flg;
} }

158
lib/sj3core/priority.c
View file

@ -33,8 +33,6 @@
* $SonyDate: 1994/06/03 08:02:10 $ * $SonyDate: 1994/06/03 08:02:10 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
#include "sj_right.h" #include "sj_right.h"
@ -43,49 +41,44 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
static int static int
isfukusi(TypeGram hinsi) isfukusi(TypeGram hinsi) {
{ if(FUKUSI_1 <= hinsi && hinsi <= FUKUSI_7)
if (FUKUSI_1 <= hinsi && hinsi <= FUKUSI_7)
return TRUE; return TRUE;
else if (hinsi == MEISI_11 || hinsi == D_MEISI_6) else if(hinsi == MEISI_11 || hinsi == D_MEISI_6)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
static int static int
istaigen(TypeCnct right) istaigen(TypeCnct right) {
{ if(right == R_MEISI || right == R_DMEISI || right == R_SMEISI1)
if (right == R_MEISI || right == R_DMEISI || right == R_SMEISI1)
return TRUE; return TRUE;
if (right == R_WO_MEISI || right == R_DAIMEISI || right == R_JOSUUSI) if(right == R_WO_MEISI || right == R_DAIMEISI || right == R_JOSUUSI)
return TRUE; return TRUE;
if (right == R_RENYOU1 || (R_RENYOU3 <= right && right <= R_SA5RENYOU4)) if(right == R_RENYOU1 || (R_RENYOU3 <= right && right <= R_SA5RENYOU4))
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
static int static int
taicnt(TypeGram hinsi1, TypeGram hinsi2) taicnt(TypeGram hinsi1, TypeGram hinsi2) {
{ if(hinsi2 == TANKANJI) return 0;
if (hinsi2 == TANKANJI) return 0;
if (MYOUJI <= hinsi1 && hinsi1 <= KEN_KU) { if(MYOUJI <= hinsi1 && hinsi1 <= KEN_KU) {
if (MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9) if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9)
return Taipri(hinsi1 - MYOUJI, hinsi2); return Taipri(hinsi1 - MYOUJI, hinsi2);
else else
return 3; return 3;
} } else if((MEISI_1 <= hinsi1 && hinsi1 <= MEISI_11) ||
else if ((MEISI_1 <= hinsi1 && hinsi1 <= MEISI_11) ||
hinsi1 == D_MEISI_2) { hinsi1 == D_MEISI_2) {
if (MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9) { if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9) {
return Taipri(5, hinsi2); return Taipri(5, hinsi2);
} } else
else
return 5; return 5;
} }
else { else {
if (MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9) if(MEISI_1 <= hinsi2 && hinsi2 <= SETUBI_9)
return Taipri(6, hinsi2); return Taipri(6, hinsi2);
else else
return 4; return 4;
@ -93,70 +86,65 @@ taicnt(TypeGram hinsi1, TypeGram hinsi2)
} }
static int static int
sttcnt(TypeGram hinsi1, TypeGram hinsi2) sttcnt(TypeGram hinsi1, TypeGram hinsi2) {
{ if(SETTOU_1 <= hinsi1 && hinsi1 <= SETTOU_5) {
if (SETTOU_1 <= hinsi1 && hinsi1 <= SETTOU_5) { if(MEISI_1 <= hinsi2 && hinsi2 <= SUUSI)
if (MEISI_1 <= hinsi2 && hinsi2 <= SUUSI)
return Sttpri(hinsi1 - SETTOU_1, hinsi2); return Sttpri(hinsi1 - SETTOU_1, hinsi2);
} }
return 4; return 4;
} }
int int priority(CLREC* clrec) {
priority(CLREC *clrec)
{
int prty; int prty;
CLREC *cl2rec; CLREC* cl2rec;
int keeplen; int keeplen;
TypeGram hinsi1; TypeGram hinsi1;
int i; int i;
int prev = 0; int prev = 0;
if (clrec->cllen == clrec->cl2len) return 0xff; if(clrec->cllen == clrec->cl2len) return 0xff;
if (clrec->jnode->class == C_BUNSETU) { if(clrec->jnode->class == C_BUNSETU) {
prty = Termtbl[clrec->right] & GETPRI; prty = Termtbl[clrec->right] & GETPRI;
return(0xf0 + prty); return (0xf0 + prty);
} }
hinsi1 = clrec->jnode->hinsi; hinsi1 = clrec->jnode->hinsi;
if (prevclrow == R_WO || prevclrow == R_WO_S || if(prevclrow == R_WO || prevclrow == R_WO_S ||
prevclrow == R_NI1 || prevclrow == R_DRENYOU2) { prevclrow == R_NI1 || prevclrow == R_DRENYOU2) {
if (clrec -> kubun == K_DOUSHI || isfukusi(hinsi1)) if(clrec->kubun == K_DOUSHI || isfukusi(hinsi1))
prev = 5; prev = 5;
} }
else if (istaigen(prevclrow)) { else if(istaigen(prevclrow)) {
if (clrec -> kubun == K_TAIGEN) if(clrec->kubun == K_TAIGEN)
prev = taicnt(prevclgrm, hinsi1); prev = taicnt(prevclgrm, hinsi1);
else else
prev = 0; prev = 0;
} }
else if (prevclrow == R_SETTOU) { else if(prevclrow == R_SETTOU) {
if (clrec -> jnode -> sttofs) if(clrec->jnode->sttofs)
prty = 2; prty = 2;
else else
prty = sttcnt(prevclgrm, hinsi1); prty = sttcnt(prevclgrm, hinsi1);
} }
if(hinsi1 >= SETUBI_1 && hinsi1 <= SETUBI_9 && (!prev)) {
if (hinsi1 >= SETUBI_1 && hinsi1 <= SETUBI_9 && (!prev)) {
prty = 1; prty = 1;
goto finish; goto finish;
} }
cl2rec = maxclptr; cl2rec = maxclptr;
keeplen = cl2rec -> cllen; keeplen = cl2rec->cllen;
if (clrec->right == R_WO || clrec->right == R_WO_S || if(clrec->right == R_WO || clrec->right == R_WO_S ||
clrec->right == R_NI1 || clrec->right == R_DRENYOU2) { clrec->right == R_NI1 || clrec->right == R_DRENYOU2) {
while (cl2rec && (int)cl2rec->cllen == keeplen) { while(cl2rec && (int)cl2rec->cllen == keeplen) {
if (cl2rec->kubun == K_DOUSHI) { if(cl2rec->kubun == K_DOUSHI) {
prty = 14; prty = 14;
goto finish; goto finish;
} }
@ -164,42 +152,40 @@ priority(CLREC *clrec)
} }
} }
else if (clrec->right == R_SETTOU) { else if(clrec->right == R_SETTOU) {
prty = 0; prty = 0;
while (cl2rec && (int)cl2rec -> cllen == keeplen) { while(cl2rec && (int)cl2rec->cllen == keeplen) {
if (cl2rec -> jnode -> sttofs ) if(cl2rec->jnode->sttofs)
i = 2; i = 2;
else else
i = sttcnt(hinsi1, cl2rec->jnode->hinsi); i = sttcnt(hinsi1, cl2rec->jnode->hinsi);
if (i > prty) if(i > prty)
prty = i; prty = i;
cl2rec = cl2rec -> clsort; cl2rec = cl2rec->clsort;
} }
goto finish; goto finish;
} }
else if (istaigen(clrec->right)) { else if(istaigen(clrec->right)) {
prty = 0; prty = 0;
while (cl2rec && (int)cl2rec->cllen == keeplen) { while(cl2rec && (int)cl2rec->cllen == keeplen) {
i = taicnt(hinsi1, cl2rec->jnode->hinsi); i = taicnt(hinsi1, cl2rec->jnode->hinsi);
if (i > prty) if(i > prty)
prty = i; prty = i;
cl2rec = cl2rec->clsort; cl2rec = cl2rec->clsort;
} }
if (clrec->jnode->stbofs) { if(clrec->jnode->stbofs) {
prty -= 3; prty -= 3;
} }
goto finish; goto finish;
} }
prty = Termtbl[clrec->right]; prty = Termtbl[clrec->right];
if(prty & RENTAI) {
if (prty & RENTAI) { while(cl2rec && (int)cl2rec->cllen == keeplen) {
while (cl2rec && (int)cl2rec->cllen == keeplen) { if(cl2rec->kubun == K_TAIGEN) {
if (cl2rec -> kubun == K_TAIGEN) {
prty &= GETPRI; prty &= GETPRI;
goto finish; goto finish;
} }
@ -211,14 +197,13 @@ priority(CLREC *clrec)
else { else {
prty &= GETPRI; prty &= GETPRI;
if (prty == P_RENYOU_J || prty == P_RENYOU_M ) { if(prty == P_RENYOU_J || prty == P_RENYOU_M) {
while (clrec->cllen != 1 && cl2rec && while(clrec->cllen != 1 && cl2rec &&
(int)cl2rec->cllen == keeplen ) { (int)cl2rec->cllen == keeplen) {
if (cl2rec->kubun == K_DOUSHI) { if(cl2rec->kubun == K_DOUSHI) {
prty = 6; prty = 6;
goto finish; goto finish;
} } else if(cl2rec->jnode->hinsi == SETUBI_1 ||
else if (cl2rec->jnode->hinsi == SETUBI_1 ||
cl2rec->jnode->hinsi == SETUBI_2) { cl2rec->jnode->hinsi == SETUBI_2) {
prty = 7; prty = 7;
goto finish; goto finish;
@ -229,57 +214,53 @@ priority(CLREC *clrec)
} }
} }
finish: finish:
cl2rec = maxclptr; cl2rec = maxclptr;
if (hinsi1 == SUUSI) prty -= 4; if(hinsi1 == SUUSI) prty -= 4;
if (cl2rec -> jnode -> hinsi == SUUSI) prty -= 3; if(cl2rec->jnode->hinsi == SUUSI) prty -= 3;
if (cl2rec->jnode->class == C_DICT && if(cl2rec->jnode->class == C_DICT &&
cl2rec->jnode->jlen == 1 && (cl2rec->kubun != K_DOUSHI)) { cl2rec->jnode->jlen == 1 && (cl2rec->kubun != K_DOUSHI)) {
prty -= 2; prty -= 2;
} }
if ((!istaigen(clrec->right)) && (cl2rec->jnode->hinsi == SETUBI_2)) { if((!istaigen(clrec->right)) && (cl2rec->jnode->hinsi == SETUBI_2)) {
prty -= 4; prty -= 4;
} }
prty += 20 - clrec->cllen + clrec->jnode->jlen + clrec->gobiln; prty += 20 - clrec->cllen + clrec->jnode->jlen + clrec->gobiln;
return(prty + prev); return (prty + prev);
} }
void pritiny() {
void CLREC* clrec;
pritiny()
{
CLREC *clrec;
int keeplen; int keeplen;
int i, prty = 0; int i, prty = 0;
clrec = selcl; clrec = selcl;
keeplen = clrec -> cllen; keeplen = clrec->cllen;
if (istaigen(prevclrow)) { if(istaigen(prevclrow)) {
while (clrec && (int)clrec -> cllen == keeplen) { while(clrec && (int)clrec->cllen == keeplen) {
i = taicnt(prevclgrm, clrec -> jnode -> hinsi); i = taicnt(prevclgrm, clrec->jnode->hinsi);
if (i > prty) { if(i > prty) {
selcl = clrec; selcl = clrec;
prty = i; prty = i;
} }
clrec = clrec -> clsort; clrec = clrec->clsort;
} }
} }
else { else {
while (clrec && (int)clrec -> cllen == keeplen) { while(clrec && (int)clrec->cllen == keeplen) {
if (clrec -> jnode -> hinsi >= MYOUJI && if(clrec->jnode->hinsi >= MYOUJI &&
clrec -> jnode -> hinsi <= KEN_KU) clrec->jnode->hinsi <= KEN_KU)
clrec = clrec -> clsort; clrec = clrec->clsort;
else if (clrec -> jnode -> hinsi == TANKANJI) else if(clrec->jnode->hinsi == TANKANJI)
return; return;
else { else {
selcl = clrec; selcl = clrec;
@ -288,4 +269,3 @@ pritiny()
} }
} }
} }

202
lib/sj3core/prtytbl.c
View file

@ -33,8 +33,6 @@
* $SonyDate: 1994/06/03 08:02:11 $ * $SonyDate: 1994/06/03 08:02:11 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
@ -42,63 +40,209 @@
u_char taipri[7][45] = { u_char taipri[7][45] = {
{ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, {0, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 3, 3, 3, 3, 3, 3, 0, 0, 4, 4, 3, 3, 3, 3, 3, 3, 0, 0,
0, 3, 20, 4, 3, 3, 4, 4, 4, 4, 0, 3, 20, 4, 3, 3, 4, 4, 4, 4,
4, 4, 4, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, 4, 4, 4, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
{ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, {0, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 3, 3, 3, 3, 3, 3, 0, 0, 4, 4, 3, 3, 3, 3, 3, 3, 0, 0,
0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, 4, 4, 4, 20, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
{ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, {0, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 3, 3, 3, 3, 3, 3, 0, 0, 4, 4, 3, 3, 3, 3, 3, 3, 0, 0,
0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 6}, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 6},
{ 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, {0, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 3, 3, 3, 3, 3, 3, 0, 0, 5, 5, 3, 3, 3, 3, 3, 3, 0, 0,
0, 3, 3, 3, 4, 5, 4, 4, 4, 4, 0, 3, 3, 3, 4, 5, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 6, 6, 6, 8, 4, 4, 4, 4, 6}, 4, 4, 4, 4, 4, 4, 6, 6, 6, 8, 4, 4, 4, 4, 6},
{ 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, {0, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 4, 4, 4, 4, 4, 4, 0, 0, 7, 7, 4, 4, 4, 4, 4, 4, 0, 0,
0, 4, 4, 4, 20, 20, 4, 4, 4, 4, 0, 4, 4, 4, 20, 20, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 6}, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 6},
{ 0, 8, 8, 8, 8, 8, 7, 8, 8, 8, {0, 8, 8, 8, 8, 8, 7, 8, 8, 8,
8, 8, 3, 6, 7, 3, 3, 5, 0, 0, 8, 8, 3, 6, 7, 3, 3, 5, 0, 0,
0, 3, 3, 3, 3, 3, 5, 5, 5, 5, 0, 3, 3, 3, 3, 3, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 8, 8, 11, 5, 7, 7, 7, 7, 7}, 5, 5, 5, 5, 5, 5, 8, 8, 11, 5, 7, 7, 7, 7, 7},
{ 0, 5, 6, 6, 6, 6, 5, 6, 6, 6, {0, 5, 6, 6, 6, 6, 5, 6, 6, 6,
6, 6, 3, 3, 3, 3, 3, 5, 0, 0, 6, 6, 3, 3, 3, 3, 3, 5, 0, 0,
0, 3, 3, 3, 3, 3, 5, 5, 5, 5, 0, 3, 3, 3, 3, 3, 5, 5, 5, 5,
4, 5, 5, 5, 5, 5, 5, 6, 6, 5, 5, 5, 5, 5, 5} 4, 5, 5, 5, 5, 5, 5, 6, 6, 5, 5, 5, 5, 5, 5}};
};
u_char sttpri[5][31] = { u_char sttpri[5][31] = {
{ 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, {
7, 7, 2, 4, 4, 4, 4, 4, 0, 0, 0,
0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, }, 7,
7,
7,
7,
7,
7,
7,
7,
7,
7,
7,
2,
4,
4,
4,
4,
4,
0,
0,
0,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
},
{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, {
4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 4,
0, 4, 4, 4, 10, 10, 4, 4, 4, 4, 4, }, 4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
0,
0,
0,
4,
4,
4,
10,
10,
4,
4,
4,
4,
4,
},
{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, {
4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 4,
0, 10, 10, 4, 4, 4, 4, 4, 4, 4, 4, }, 4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
0,
0,
0,
10,
10,
4,
4,
4,
4,
4,
4,
4,
4,
},
{ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, {
4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0,
0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 15, }, 4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
0,
0,
0,
4,
4,
4,
4,
4,
4,
4,
4,
4,
15,
},
{ 0, 12, 12, 12, 12, 12, 12, 12, 12, 12, {
12, 12, 9, 9, 9, 9, 9, 9, 0, 0, 0,
0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, } 12,
}; 12,
12,
12,
12,
12,
12,
12,
12,
12,
12,
9,
9,
9,
9,
9,
9,
0,
0,
0,
4,
4,
4,
4,
4,
4,
4,
4,
4,
4,
}};

5
lib/sj3core/s2ctbl.c
View file

@ -33,8 +33,6 @@
* $SonyDate: 1995/07/21 05:22:51 $ * $SonyDate: 1995/07/21 05:22:51 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_yomi.h" #include "sj_yomi.h"
@ -149,5 +147,4 @@ u_char kigou[] = {
Y_KIGOU, Y_KIGOU,
Y_KIGOU, Y_KIGOU,
Y_KIGOU, Y_KIGOU,
Y_KIGOU Y_KIGOU};
};

699
lib/sj3core/sdepend.c
View file

File diff suppressed because it is too large Load diff

44
lib/sj3core/selclrec.c
View file

@ -36,46 +36,44 @@
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void selclrec() {
selclrec()
{
int len; int len;
CLREC *rec; CLREC* rec;
nextcllen = 0; nextcllen = 0;
len = selcl -> cllen; len = selcl->cllen;
rec = clt1st; rec = clt1st;
while (rec) { while(rec) {
if (len >= (unsigned int) rec -> cllen) break; if(len >= (unsigned int)rec->cllen) break;
rec = rec -> clsort; rec = rec->clsort;
} }
while (rec) { while(rec) {
if (len > (unsigned int) rec -> cllen) return; if(len > (unsigned int)rec->cllen) return;
if (rec -> jnode -> class == C_BUNSETU) break; if(rec->jnode->class == C_BUNSETU) break;
rec = rec -> clsort; rec = rec->clsort;
} }
if (!rec) return; if(!rec) return;
len = ClYomi1Len(CLSTUDYDICT + rec->jnode->jofsst); len = ClYomi1Len(CLSTUDYDICT + rec->jnode->jofsst);
nextcllen = rec -> cllen - len; nextcllen = rec->cllen - len;
while (rec) { while(rec) {
if (len == rec -> cllen) { if(len == rec->cllen) {
selcl = rec; selcl = rec;
break; break;
} }
else if (len > (unsigned int) rec -> cllen) { else if(len > (unsigned int)rec->cllen) {
rec = NULL; rec = NULL;
break; break;
} }
rec = rec -> clsort; rec = rec->clsort;
} }
if (rec == NULL) { if(rec == NULL) {
int klen; int klen;
u_char ch; u_char ch;
@ -90,7 +88,7 @@ selclrec()
mkjiritu(DO_IKKATU); mkjiritu(DO_IKKATU);
mkbunsetu(); mkbunsetu();
if (!maxclptr) wakachi(); if(!maxclptr) wakachi();
jrt1st = maxjptr; jrt1st = maxjptr;
selcl = clt1st = maxclptr; selcl = clt1st = maxclptr;
@ -99,6 +97,8 @@ selclrec()
*(cnvstart + len) = ch; *(cnvstart + len) = ch;
} }
free_clall(clt2nd); clt2nd = NULL; free_clall(clt2nd);
free_jall(jrt2nd); jrt2nd = NULL; clt2nd = NULL;
free_jall(jrt2nd);
jrt2nd = NULL;
} }

36
lib/sj3core/selsuuji.c
View file

@ -46,8 +46,7 @@ static u_short selsjAR[] = {
SELKANSJYM | JFLAG_NN0, SELKANSJYM | JFLAG_NN0,
SELKANSJYM2 | SELNUM1_23_10_1 | JFLAG_NN0, SELKANSJYM2 | SELNUM1_23_10_1 | JFLAG_NN0,
SELKANSJ0 | JFLAG_NK2, SELKANSJ0 | JFLAG_NK2,
SELNUMTERM SELNUMTERM};
};
static u_short selsjARCM[] = { static u_short selsjARCM[] = {
SELARBCMA | JFLAG_NK4 | JFLAG_NN0, SELARBCMA | JFLAG_NK4 | JFLAG_NN0,
@ -55,8 +54,7 @@ static u_short selsjARCM[] = {
SELKANSJYM | JFLAG_NN0, SELKANSJYM | JFLAG_NN0,
SELKANSJYM2 | SELNUM1_23_10_1 | JFLAG_NN0, SELKANSJYM2 | SELNUM1_23_10_1 | JFLAG_NN0,
SELKANSJ0 | JFLAG_NK2, SELKANSJ0 | JFLAG_NK2,
SELNUMTERM SELNUMTERM};
};
static u_short selsjKAZU[] = { static u_short selsjKAZU[] = {
SELKANSJYM | JFLAG_NN0, SELKANSJYM | JFLAG_NN0,
@ -64,52 +62,43 @@ static u_short selsjKAZU[] = {
SELKANSJ0 | JFLAG_NK2, SELKANSJ0 | JFLAG_NK2,
SELARB0, SELARB0,
SELARBCMA | JFLAG_NK4 | JFLAG_NN0, SELARBCMA | JFLAG_NK4 | JFLAG_NN0,
SELNUMTERM SELNUMTERM};
};
static u_short selsjSUUJI[] = { static u_short selsjSUUJI[] = {
SELKANSJ0, SELKANSJ0,
SELARB0, SELARB0,
SELNUMTERM SELNUMTERM};
};
static u_short selsjNANSUU[] = { static u_short selsjNANSUU[] = {
SELKANSJYM, SELKANSJYM,
SELNUMTERM SELNUMTERM};
};
static u_short selsjAR17[] = { static u_short selsjAR17[] = {
SELLONGARB, SELLONGARB,
SELLONGARBCMA, SELLONGARBCMA,
SELNUMTERM SELNUMTERM};
};
static u_short selsjAR17CM[] = { static u_short selsjAR17CM[] = {
SELLONGARBCMA, SELLONGARBCMA,
SELLONGARB, SELLONGARB,
SELNUMTERM SELNUMTERM};
};
static u_short selsjAR17SJ[] = { static u_short selsjAR17SJ[] = {
SELLONGARB, SELLONGARB,
SELLONGSJ, SELLONGSJ,
SELNUMTERM SELNUMTERM};
};
static u_short selsjKANKURA[] = { static u_short selsjKANKURA[] = {
SELKANSJKR, SELKANSJKR,
SELARBKR, SELARBKR,
SELNUMTERM SELNUMTERM};
};
static u_short selsjARAKURA[] = { static u_short selsjARAKURA[] = {
SELARBKR, SELARBKR,
SELKANSJKR | JFLAG_NSN, SELKANSJKR | JFLAG_NSN,
SELNUMTERM SELNUMTERM};
};
u_short* selsjadrs[] = {
u_short *selsjadrs[] = {
selsjAR, selsjAR,
selsjARCM, selsjARCM,
selsjKAZU, selsjKAZU,
@ -119,5 +108,4 @@ u_short *selsjadrs[] = {
selsjARAKURA, selsjARAKURA,
selsjAR17, selsjAR17,
selsjAR17CM, selsjAR17CM,
selsjAR17SJ selsjAR17SJ};
};

71
lib/sj3core/setconj.c
View file

@ -33,8 +33,6 @@
* $SonyDate: 1994/06/03 08:02:16 $ * $SonyDate: 1994/06/03 08:02:16 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_right.h" #include "sj_right.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
@ -43,32 +41,31 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
static int static int
cnjstrcmp(u_char *yptr, u_char *cnjp, int *saml) cnjstrcmp(u_char* yptr, u_char* cnjp, int* saml) {
{
int asklen; int asklen;
int nkrlen; int nkrlen;
asklen = CnjAskLen(cnjp); asklen = CnjAskLen(cnjp);
if (*saml < asklen) return CONT; if(*saml < asklen) return CONT;
if (*saml > asklen) return OVER; if(*saml > asklen) return OVER;
nkrlen = CnjNkrLen(cnjp); nkrlen = CnjNkrLen(cnjp);
yptr += asklen; yptr += asklen;
cnjp ++; cnjp++;
while (nkrlen--) { while(nkrlen--) {
if (*yptr > *cnjp) if(*yptr > *cnjp)
return CONT; return CONT;
else if (*yptr < *cnjp) { else if(*yptr < *cnjp) {
if (!*yptr) return PARTLY; if(!*yptr) return PARTLY;
return OVER; return OVER;
} }
else{ else {
yptr++; yptr++;
cnjp++; cnjp++;
(*saml)++; (*saml)++;
@ -79,22 +76,21 @@ cnjstrcmp(u_char *yptr, u_char *cnjp, int *saml)
} }
static TypeCnct static TypeCnct
cnvrow(JREC *rec, TypeCnct row) cnvrow(JREC* rec, TypeCnct row) {
{
TypeGram hinsi; TypeGram hinsi;
int stt; int stt;
hinsi = rec -> hinsi; hinsi = rec->hinsi;
if ((stt = rec -> sttofs) == SETTOU_O) { if((stt = rec->sttofs) == SETTOU_O) {
if (R_RENYOU1 <= row && row <= R_SA5RENYOU1) if(R_RENYOU1 <= row && row <= R_SA5RENYOU1)
row += 6; row += 6;
else if (R_RENYOU3 <= row && row <= R_SA5RENYOU3) else if(R_RENYOU3 <= row && row <= R_SA5RENYOU3)
row += 3; row += 3;
else if((hinsi>=KEIYOUSI_1 && hinsi<=KE_DOUSI_9)|| else if((hinsi >= KEIYOUSI_1 && hinsi <= KE_DOUSI_9) ||
(hinsi == MEISI_5) || (hinsi == MEISI_9)) (hinsi == MEISI_5) || (hinsi == MEISI_9))
; ;
@ -102,52 +98,50 @@ cnvrow(JREC *rec, TypeCnct row)
row = 0; row = 0;
} }
else if (stt == SETTOU_GO) { else if(stt == SETTOU_GO) {
if (hinsi == MEISI_7 && row == R_SMEISI1) if(hinsi == MEISI_7 && row == R_SMEISI1)
row++; row++;
} }
return row; return row;
} }
int int setconj(TypeGram hinsi, JREC* jrec, CREC* crec) {
setconj(TypeGram hinsi, JREC *jrec, CREC *crec) u_char* yptr;
{
u_char *yptr;
int cmp; int cmp;
TypeCnct right; TypeCnct right;
int saml; int saml;
int ofslen; int ofslen;
int count = 0; int count = 0;
u_char *cnj; u_char* cnj;
if (cnj = Conjadr(hinsi)) { if(cnj = Conjadr(hinsi)) {
saml = ofslen = 0; saml = ofslen = 0;
yptr = cnvstart + jrec -> jlen; yptr = cnvstart + jrec->jlen;
if ((*cnj) & TYOUONFLG) { if((*cnj) & TYOUONFLG) {
while (*yptr == _TYOUON) { while(*yptr == _TYOUON) {
yptr++; yptr++;
ofslen++; ofslen++;
} }
} }
for ( ; *cnj != CNJEND ; cnj += CnjRecLen(cnj)) { for(; *cnj != CNJEND; cnj += CnjRecLen(cnj)) {
cmp = cnjstrcmp(yptr, cnj, &saml); cmp = cnjstrcmp(yptr, cnj, &saml);
if (cmp == OVER) break; if(cmp == OVER) break;
if (cmp == PARTLY) break; if(cmp == PARTLY) break;
if (cmp != MATCH) continue; if(cmp != MATCH) continue;
if (isdpnd(*(yptr + saml))) continue; if(isdpnd(*(yptr + saml))) continue;
if (right = cnvrow(jrec, (TypeCnct)CnjRight(cnj))) { if(right = cnvrow(jrec, (TypeCnct)CnjRight(cnj))) {
crec -> len = (u_char)(ofslen + saml); crec->len = (u_char)(ofslen + saml);
crec -> right = right; crec->right = right;
count++; count++;
crec++; crec++;
} }
@ -156,4 +150,3 @@ setconj(TypeGram hinsi, JREC *jrec, CREC *crec)
return count; return count;
} }

219
lib/sj3core/setjrec.c
View file

@ -39,127 +39,122 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int setj_atrb(u_char* p) {
setj_atrb(u_char *p)
{
return 2; return 2;
} }
int int setj_ofs(u_char* p) {
setj_ofs(u_char *p)
{
int contf = TRUE; int contf = TRUE;
p = dicbuf + ((*p & KANJICODEMASK) << 8) + *(p + 1); p = dicbuf + ((*p & KANJICODEMASK) << 8) + *(p + 1);
do { do {
if (p[codesize(*p)] == KANJISTREND) contf = FALSE; if(p[codesize(*p)] == KANJISTREND) contf = FALSE;
switch(*p & KANJIMODEMASK) { switch(*p & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
p += setj_norm1(p); break; p += setj_norm1(p);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
p += setj_norm1(p); break; p += setj_norm1(p);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
p += setj_ofs(p); break; p += setj_ofs(p);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
p += setj_atrb(p); break; p += setj_atrb(p);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
p += setj_norm2(p); break; p += setj_norm2(p);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
p += setj_knj(p); break; p += setj_knj(p);
break;
case KANJISTREND: case KANJISTREND:
contf = FALSE; break; contf = FALSE;
break;
default: default:
p += setj_norm2(p); p += setj_norm2(p);
} }
} while (contf); } while(contf);
return 2; return 2;
} }
int int setj_knj(u_char* p) {
setj_knj(u_char *p)
{
int contf = TRUE; int contf = TRUE;
p = askknj[*p & KNJASSYUKUMASK]; p = askknj[*p & KNJASSYUKUMASK];
do { do {
if (p[codesize(*p)]== KANJISTREND) contf = FALSE; if(p[codesize(*p)] == KANJISTREND) contf = FALSE;
switch(*p & KANJIMODEMASK) { switch(*p & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
p += setj_norm1(p); break; p += setj_norm1(p);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
p += setj_norm1(p); break; p += setj_norm1(p);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
p += setj_ofs(p); break; p += setj_ofs(p);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
p += setj_atrb(p); break; p += setj_atrb(p);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
p += setj_norm2(p); break; p += setj_norm2(p);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
p += setj_knj(p); break; p += setj_knj(p);
break;
case KANJISTREND: case KANJISTREND:
contf = FALSE; break; contf = FALSE;
break;
default: default:
p += setj_norm2(p); p += setj_norm2(p);
} }
} while (contf); } while(contf);
return 1; return 1;
} }
int setj_norm1(u_char* p) {
int
setj_norm1(u_char *p)
{
return 1; return 1;
} }
int setj_norm2(u_char* p) {
int
setj_norm2(u_char *p)
{
return 2; return 2;
} }
int int setj_norm3(u_char* p) {
setj_norm3(u_char *p)
{
return 3; return 3;
} }
static u_char static u_char
chkhead(TypeGram gram) chkhead(TypeGram gram) {
{ if(!headcode) return TRUE;
if (!headcode) return TRUE;
if (headcode == SETTOU_DAI) { if(headcode == SETTOU_DAI) {
if (gram == SUUSI) return TRUE; if(gram == SUUSI) return TRUE;
} }
else { else {
gram--; gram--;
if ((Scncttbl(headcode-1, gram >> 3) << (gram & 0x07)) & 0x80) { if((Scncttbl(headcode - 1, gram >> 3) << (gram & 0x07)) & 0x80) {
return TRUE; return TRUE;
} }
} }
@ -167,16 +162,12 @@ chkhead(TypeGram gram)
return FALSE; return FALSE;
} }
void setjrec(u_char* tagp, int mode) {
void
setjrec(u_char *tagp, int mode)
{
TypeGram gram; TypeGram gram;
u_char *ptr; u_char* ptr;
u_char *endp; u_char* endp;
u_char *tmp; u_char* tmp;
JREC *rec; JREC* rec;
int plen; int plen;
int nlen; int nlen;
int len; int len;
@ -186,67 +177,70 @@ setjrec(u_char *tagp, int mode)
len = plen + nlen; len = plen + nlen;
if (headcode) len += headlen; if(headcode) len += headlen;
ptr = tagp + DOUONBLKSIZENUMBER + nlen; ptr = tagp + DOUONBLKSIZENUMBER + nlen;
endp = tagp + getsize(tagp); endp = tagp + getsize(tagp);
for ( ; ptr < endp ; ptr = tmp + 1) { for(; ptr < endp; ptr = tmp + 1) {
for (tmp = ptr + 1; *tmp != HINSIBLKTERM ; ) { for(tmp = ptr + 1; *tmp != HINSIBLKTERM;) {
switch(*tmp & KANJIMODEMASK) { switch(*tmp & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
tmp += setj_norm1(tmp); break; tmp += setj_norm1(tmp);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
tmp += setj_norm1(tmp); break; tmp += setj_norm1(tmp);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
tmp += setj_ofs(tmp); break; tmp += setj_ofs(tmp);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
tmp += setj_atrb(tmp); break; tmp += setj_atrb(tmp);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
tmp += setj_norm2(tmp); break; tmp += setj_norm2(tmp);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
tmp += setj_knj(tmp); break; tmp += setj_knj(tmp);
break;
case KANJISTREND: case KANJISTREND:
tmp++; break; tmp++;
break;
default: default:
tmp += setj_norm2(tmp); tmp += setj_norm2(tmp);
} }
} }
if ((gram = *ptr) == IKKATU && !(mode & DO_IKKATU)) continue; if((gram = *ptr) == IKKATU && !(mode & DO_IKKATU)) continue;
if (!chkhead(gram)) continue; if(!chkhead(gram)) continue;
if (!(rec = argjrec(len, (JREC *)NULL))) continue; if(!(rec = argjrec(len, (JREC*)NULL))) continue;
rec -> jseg = prevseg; rec->jseg = prevseg;
rec -> jofsst = ptr - dicbuf; rec->jofsst = ptr - dicbuf;
rec -> jofsed = tmp - dicbuf; rec->jofsed = tmp - dicbuf;
rec -> class = C_DICT; rec->class = C_DICT;
rec -> dicid = curdict->dicid; rec->dicid = curdict->dicid;
rec -> hinsi = gram; rec->hinsi = gram;
rec -> sttofs = headcode; rec->sttofs = headcode;
} }
} }
void setnumrec(u_char* tagp, JREC* rec, TypeGram gram) {
u_char* ptr;
void u_char* endp;
setnumrec(u_char *tagp, JREC *rec, TypeGram gram) u_char* tmp;
{
u_char *ptr;
u_char *endp;
u_char *tmp;
int plen, nlen, len; int plen, nlen, len;
JREC *jrec; JREC* jrec;
plen = getplen(tagp); plen = getplen(tagp);
nlen = getnlen(tagp); nlen = getnlen(tagp);
@ -257,56 +251,59 @@ setnumrec(u_char *tagp, JREC *rec, TypeGram gram)
endp = tagp + getsize(tagp); endp = tagp + getsize(tagp);
for ( ; ptr < endp ; ptr = tmp + 1) { for(; ptr < endp; ptr = tmp + 1) {
for (tmp = ptr + 1; *tmp != HINSIBLKTERM ; ) { for(tmp = ptr + 1; *tmp != HINSIBLKTERM;) {
switch(*tmp & KANJIMODEMASK) { switch(*tmp & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
tmp += setj_norm1(tmp); break; tmp += setj_norm1(tmp);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
tmp += setj_norm1(tmp); break; tmp += setj_norm1(tmp);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
tmp += setj_ofs(tmp); break; tmp += setj_ofs(tmp);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
tmp += setj_atrb(tmp); break; tmp += setj_atrb(tmp);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
tmp += setj_norm2(tmp); break; tmp += setj_norm2(tmp);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
tmp += setj_knj(tmp); break; tmp += setj_knj(tmp);
break;
case KANJISTREND: case KANJISTREND:
tmp++; break; tmp++;
break;
default: default:
tmp += setj_norm2(tmp); tmp += setj_norm2(tmp);
} }
} }
if (gram != *ptr) continue; if(gram != *ptr) continue;
if (!(jrec = argjrec((int)(rec -> jlen + len), rec))) continue; if(!(jrec = argjrec((int)(rec->jlen + len), rec))) continue;
jrec -> jseg = prevseg; jrec->jseg = prevseg;
jrec -> jofsst = ptr - dicbuf; jrec->jofsst = ptr - dicbuf;
jrec -> jofsed = tmp - dicbuf; jrec->jofsed = tmp - dicbuf;
jrec -> dicid = curdict->dicid; jrec->dicid = curdict->dicid;
} }
} }
void setcrec(u_char* tagp) {
JREC* rec;
if(!(rec = argjrec((int)ClYomiLen(tagp), (JREC*)NULL))) return;
void rec->jofsst = tagp - CLSTUDYDICT;
setcrec(u_char *tagp) rec->class = C_BUNSETU;
{ rec->hinsi = ClGramCode(tagp);
JREC *rec;
if (!(rec = argjrec((int)ClYomiLen(tagp), (JREC *)NULL))) return;
rec -> jofsst = tagp - CLSTUDYDICT;
rec -> class = C_BUNSETU;
rec -> hinsi = ClGramCode(tagp);
} }

199
lib/sj3core/setkouho.c
View file

@ -41,94 +41,92 @@
static int hiraknj(); static int hiraknj();
void void setkouho(CLREC* clrec, TypeDicOfs offs, int mode) {
setkouho(CLREC *clrec, TypeDicOfs offs, int mode) JREC* jrec;
{ KHREC* kptr;
JREC *jrec; u_char* fptr;
KHREC *kptr;
u_char *fptr;
int flg; int flg;
int i; int i;
if (khcount >= MAXKOUHONUMBER) return; if(khcount >= MAXKOUHONUMBER) return;
jrec = clrec -> jnode; jrec = clrec->jnode;
kptr = &kouhotbl[khcount++]; kptr = &kouhotbl[khcount++];
if (mode && !offs) nkhcount++; if(mode && !offs) nkhcount++;
kptr -> clrec = clrec; kptr->clrec = clrec;
kptr -> offs = offs; kptr->offs = offs;
kptr -> rank = 0; kptr->rank = 0;
kptr -> styno = 0; kptr->styno = 0;
kptr -> mode = (u_char)mode; kptr->mode = (u_char)mode;
if (jrec -> flags & JFLAG_KA) { if(jrec->flags & JFLAG_KA) {
kptr -> ka_fg = 1; kptr->ka_fg = 1;
kptr -> ka_kj = 1; kptr->ka_kj = 1;
flg = 1; flg = 1;
} } else if(clrec->fzk_ka) {
else if (clrec -> fzk_ka) { kptr->ka_fg = 1;
kptr -> ka_fg = 1; kptr->ka_kj = 0;
kptr -> ka_kj = 0;
flg = 2; flg = 2;
} } else {
else { kptr->ka_fg = 0;
kptr -> ka_fg = 0; kptr->ka_kj = 0;
kptr -> ka_kj = 0;
flg = 0; flg = 0;
} }
kptr -> sttfg = kptr -> sttkj = 0; kptr->sttfg = kptr->sttkj = 0;
if (!(fptr = Settou_ptr(jrec -> sttofs))) return; if(!(fptr = Settou_ptr(jrec->sttofs))) return;
if (!SttHiraKnj(fptr)) return; if(!SttHiraKnj(fptr)) return;
kptr -> sttfg = 1; kptr->sttfg = 1;
kptr -> sttkj = 0; kptr->sttkj = 0;
i = hiraknj(dicbuf + offs); i = hiraknj(dicbuf + offs);
if (offs > 1 && (i == 2 || i == 3)) return; if(offs > 1 && (i == 2 || i == 3)) return;
if (khcount >= MAXKOUHONUMBER) return; if(khcount >= MAXKOUHONUMBER) return;
kptr++; kptr++;
khcount++; khcount++;
if (mode && !offs) nkhcount++; if(mode && !offs) nkhcount++;
kptr -> clrec = clrec; kptr->clrec = clrec;
kptr -> offs = offs; kptr->offs = offs;
kptr -> rank = 0; kptr->rank = 0;
kptr -> styno = 0; kptr->styno = 0;
kptr -> mode = (u_char)mode; kptr->mode = (u_char)mode;
kptr -> sttfg = 1; kptr->sttfg = 1;
kptr -> sttkj = 1; kptr->sttkj = 1;
switch (flg) { switch(flg) {
case 1: kptr -> ka_fg = kptr -> ka_kj = 1; break; case 1:
case 2: kptr -> ka_fg = 1; kptr -> ka_kj = 0; break; kptr->ka_fg = kptr->ka_kj = 1;
default: kptr -> ka_fg = kptr -> ka_kj = 0; break; break;
case 2:
kptr->ka_fg = 1;
kptr->ka_kj = 0;
break;
default:
kptr->ka_fg = kptr->ka_kj = 0;
break;
} }
} }
void ph_setkouho(CLREC* clrec, TypeDicOfs offs, STDYIN* sptr) {
JREC* jrec;
u_char* p;
if(sptr) {
void
ph_setkouho(CLREC *clrec, TypeDicOfs offs, STDYIN *sptr)
{
JREC *jrec;
u_char *p;
if (sptr) {
stdytop = sptr; stdytop = sptr;
kouhotbl[0].styno = sptr -> styno; kouhotbl[0].styno = sptr->styno;
kouhotbl[0].sttkj = sptr -> sttkj; kouhotbl[0].sttkj = sptr->sttkj;
} } else {
else {
kouhotbl[0].styno = -1; kouhotbl[0].styno = -1;
kouhotbl[0].sttkj = 0; kouhotbl[0].sttkj = 0;
} }
@ -137,20 +135,17 @@ ph_setkouho(CLREC *clrec, TypeDicOfs offs, STDYIN *sptr)
kouhotbl[0].offs = offs; kouhotbl[0].offs = offs;
kouhotbl[0].rank = 0; kouhotbl[0].rank = 0;
kouhotbl[0].mode = sel_sjmode(jrec = clrec -> jnode); kouhotbl[0].mode = sel_sjmode(jrec = clrec->jnode);
kouhotbl[0].sttfg = (u_char) kouhotbl[0].sttfg = (u_char)((p = Settou_ptr(jrec->sttofs)) ? (SttHiraKnj(p) ? 1 : 0) : 0);
((p = Settou_ptr(jrec->sttofs)) ? (SttHiraKnj(p)?1:0) : 0);
if (jrec -> flags & JFLAG_KA) { if(jrec->flags & JFLAG_KA) {
kouhotbl[0].ka_fg = kouhotbl[0].ka_fg =
kouhotbl[0].ka_kj = 1; kouhotbl[0].ka_kj = 1;
} } else if(clrec->fzk_ka) {
else if (clrec -> fzk_ka) {
kouhotbl[0].ka_fg = 1; kouhotbl[0].ka_fg = 1;
kouhotbl[0].ka_kj = 0; kouhotbl[0].ka_kj = 0;
} } else {
else {
kouhotbl[0].ka_fg = kouhotbl[0].ka_fg =
kouhotbl[0].ka_kj = 0; kouhotbl[0].ka_kj = 0;
} }
@ -158,118 +153,94 @@ ph_setkouho(CLREC *clrec, TypeDicOfs offs, STDYIN *sptr)
khcount = 1; khcount = 1;
} }
static int static int
hiraknj(u_char *p) hiraknj(u_char* p) {
{
char flg = TRUE; char flg = TRUE;
int i; int i;
int result; int result;
do { do {
if (p[codesize(*p)] == KANJISTREND) flg = FALSE; if(p[codesize(*p)] == KANJISTREND) flg = FALSE;
switch(*p & KANJIMODEMASK) { switch(*p & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
result = hiraknj_hask(p, &i); break; result = hiraknj_hask(p, &i);
break;
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
result = hiraknj_kask(p, &i); break; result = hiraknj_kask(p, &i);
break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
result = hiraknj_ofs(p, &i); break; result = hiraknj_ofs(p, &i);
break;
case AIATTRIBUTE: case AIATTRIBUTE:
result = hiraknj_atrb(p, &i); break; result = hiraknj_atrb(p, &i);
break;
case LEADINGHANKAKU: case LEADINGHANKAKU:
result = hiraknj_norm(p, &i); break; result = hiraknj_norm(p, &i);
break;
case KANJIASSYUKU: case KANJIASSYUKU:
result = hiraknj_knj(p, &i); break; result = hiraknj_knj(p, &i);
break;
default: default:
result = hiraknj_hira(p, &i); result = hiraknj_hira(p, &i);
} }
if (result) return result; if(result) return result;
p += i; p += i;
} while (flg); } while(flg);
return 0; return 0;
} }
int hiraknj_atrb(u_char* p, int* len) {
int
hiraknj_atrb(u_char *p, int *len)
{
*len = 2; *len = 2;
return 0; return 0;
} }
int hiraknj_ofs(u_char* p, int* len) {
int
hiraknj_ofs(u_char *p, int *len)
{
*len = 2; *len = 2;
return hiraknj(dicbuf + ((*p & KANJICODEMASK) << 8) + *(p + 1)); return hiraknj(dicbuf + ((*p & KANJICODEMASK) << 8) + *(p + 1));
} }
int hiraknj_knj(u_char* p, int* len) {
int
hiraknj_knj(u_char *p, int *len)
{
*len = 1; *len = 1;
return hiraknj(askknj[*p & KNJASSYUKUMASK]); return hiraknj(askknj[*p & KNJASSYUKUMASK]);
} }
int hiraknj_hask(u_char* p, int* len) {
int
hiraknj_hask(u_char *p, int *len)
{
*len = 1; *len = 1;
return 2; return 2;
} }
int hiraknj_kask(u_char* p, int* len) {
int
hiraknj_kask(u_char *p, int *len)
{
*len = 1; *len = 1;
return 3; return 3;
} }
int hiraknj_norm(u_char* p, int* len) {
int hiraknj_norm(u_char *p, int *len)
{
*len = codesize(*p); *len = codesize(*p);
return 1; return 1;
} }
int hiraknj_hira(u_char* p, int* len) {
int
hiraknj_hira(u_char *p, int *len)
{
u_char ch; u_char ch;
*len = codesize(*p); *len = codesize(*p);
ch = *(p + 1); ch = *(p + 1);
switch (*p) { switch(*p) {
case 0x24: case 0x24:
if (ch >= 0x21 && ch <= 0x73) return 2; if(ch >= 0x21 && ch <= 0x73) return 2;
return 1; return 1;
case 0x25: case 0x25:
if (ch >= 0x21 && ch <= 0x76) return 3; if(ch >= 0x21 && ch <= 0x76) return 3;
return 1; return 1;
default: default:

35
lib/sj3core/setubi.c
View file

@ -33,51 +33,44 @@
* $SonyDate: 1994/06/03 08:02:22 $ * $SonyDate: 1994/06/03 08:02:22 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_hinsi.h" #include "sj_hinsi.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
u_char* u_char*
getstb(TypeGram hinsi) getstb(TypeGram hinsi) {
{ if(hinsi < MEISI_1 || hinsi > TIMEI) return NULL;
if (hinsi < MEISI_1 || hinsi > TIMEI) return NULL;
return Stbadr(hinsi); return Stbadr(hinsi);
} }
void setubi(JREC* rec, u_char* stbtbl) {
void u_char* stb;
setubi(JREC *rec, u_char *stbtbl) u_char* yptr;
{ u_char* sptr;
u_char *stb;
u_char *yptr;
u_char *sptr;
int slen; int slen;
JREC *new; JREC* new;
int cmp; int cmp;
stb = stbtbl--; stb = stbtbl--;
yptr = cnvstart + rec -> jlen; yptr = cnvstart + rec->jlen;
for ( ; *stb ; stb = sptr + slen + StbKnjLen(stb)) { for(; *stb; stb = sptr + slen + StbKnjLen(stb)) {
slen = StbYomiLen(stb); slen = StbYomiLen(stb);
sptr = StbYomiTop(stb); sptr = StbYomiTop(stb);
cmp = sstrncmp(yptr, sptr, slen); cmp = sstrncmp(yptr, sptr, slen);
if (cmp == OVER || cmp == PARTLY) break; if(cmp == OVER || cmp == PARTLY) break;
if ((cmp != MATCH) || isdpnd(*(yptr + slen))) continue; if((cmp != MATCH) || isdpnd(*(yptr + slen))) continue;
if (!(new = argjrec((int)(rec -> jlen + slen), rec))) continue; if(!(new = argjrec((int)(rec->jlen + slen), rec))) continue;
new -> stbofs = (u_char)(stb - stbtbl); new->stbofs = (u_char)(stb - stbtbl);
new -> flags |= StbBakeru(stb) ? JFLAG_KA : 0; new->flags |= StbBakeru(stb) ? JFLAG_KA : 0;
} }
} }

67
lib/sj3core/sj2code.c
View file

@ -33,80 +33,74 @@
* $SonyDate: 1995/07/21 05:22:51 $ * $SonyDate: 1995/07/21 05:22:51 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int sj2cd_chr(u_char* euc, u_char* yomi) {
sj2cd_chr(u_char *euc, u_char *yomi)
{
u_char chr; u_char chr;
if ((chr = *euc++) == EUC_a1) { if((chr = *euc++) == EUC_a1) {
chr = *euc; chr = *euc;
if (chr < EUC_START) if(chr < EUC_START)
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
else if (chr <= EUC_END) else if(chr <= EUC_END)
*yomi = Kigou[chr - EUC_START]; *yomi = Kigou[chr - EUC_START];
else else
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
} else if (chr == EUC_a2) { } else if(chr == EUC_a2) {
chr = *euc; chr = *euc;
if (chr < EUC_START) if(chr < EUC_START)
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
else if (chr <= EUC_END_KIGOU) else if(chr <= EUC_END_KIGOU)
*yomi = Kigou[chr - EUC_START + 94]; *yomi = Kigou[chr - EUC_START + 94];
else else
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
} else if (chr == EUC_a3) { } else if(chr == EUC_a3) {
chr = *euc; chr = *euc;
if (chr < EUC_0) if(chr < EUC_0)
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
else if (chr <= EUC_END_0) else if(chr <= EUC_END_0)
*yomi = chr - EUC_0 + N_0; *yomi = chr - EUC_0 + N_0;
else if (chr < EUC_A) else if(chr < EUC_A)
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
else if (chr <= EUC_END_A) else if(chr <= EUC_END_A)
*yomi = chr - EUC_A + A_A; *yomi = chr - EUC_A + A_A;
else if (chr < EUC_a) else if(chr < EUC_a)
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
else if (chr <= EUC_END_a) else if(chr <= EUC_END_a)
*yomi = chr - EUC_a + A_a; *yomi = chr - EUC_a + A_a;
else else
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
} else if (chr == EUC_a4) { } else if(chr == EUC_a4) {
chr = *euc; chr = *euc;
if (chr < EUC_START) if(chr < EUC_START)
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
else if (chr <= EUC_END_HIRA) else if(chr <= EUC_END_HIRA)
*yomi = chr - EUC_START + _XA; *yomi = chr - EUC_START + _XA;
else else
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
} else if (chr == EUC_a5) { } else if(chr == EUC_a5) {
chr = *euc; chr = *euc;
if (chr == EUC_VU) if(chr == EUC_VU)
*yomi = _VU; *yomi = _VU;
else if (chr == EUC_XKA) else if(chr == EUC_XKA)
*yomi = _XKA; *yomi = _XKA;
else if (chr == EUC_XKE) else if(chr == EUC_XKE)
*yomi = _XKE; *yomi = _XKE;
else else
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
} } else {
else {
if (!(chr & 0x80)) { if(!(chr & 0x80)) {
*yomi = Y_HANKAKU; *yomi = Y_HANKAKU;
return 1; return 1;
} else if (chr == SS2) { } else if(chr == SS2) {
*yomi = Y_HANKAKU; *yomi = Y_HANKAKU;
} else if (chr == SS3) { } else if(chr == SS3) {
*yomi = Y_ZENKAKU; *yomi = Y_ZENKAKU;
return 3; return 3;
} else } else
@ -116,16 +110,11 @@ sj2cd_chr(u_char *euc, u_char *yomi)
return 2; return 2;
} }
int sj2cd_str(u_char* euc, u_char* yomi, int len) {
if(!len--) return FALSE;
int while(*euc && len--) euc += sj2cd_chr(euc, yomi++);
sj2cd_str(u_char *euc, u_char *yomi, int len)
{
if (!len--) return FALSE;
while (*euc && len--) euc += sj2cd_chr(euc, yomi++);
*yomi = 0; *yomi = 0;
return *euc ? FALSE : TRUE; return *euc ? FALSE : TRUE;

8
lib/sj3core/skiphblk.c
View file

@ -39,15 +39,13 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
u_char * u_char*
skiphblk(u_char *ptr) skiphblk(u_char* ptr) {
{
ptr++; ptr++;
while (*ptr != HINSIBLKTERM) ptr = skipkstr(ptr); while(*ptr != HINSIBLKTERM) ptr = skipkstr(ptr);
ptr++; ptr++;
return ptr; return ptr;
} }

9
lib/sj3core/skipkstr.c
View file

@ -42,18 +42,17 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
u_char * u_char*
skipkstr(u_char *ptr) skipkstr(u_char* ptr) {
{
int contf = TRUE, csize; int contf = TRUE, csize;
do { do {
csize = codesize(*ptr); csize = codesize(*ptr);
if (ptr[csize] == KANJISTREND) contf = FALSE; if(ptr[csize] == KANJISTREND) contf = FALSE;
ptr += csize; ptr += csize;
} while (contf); } while(contf);
ptr++; ptr++;

49
lib/sj3core/srchdict.c
View file

@ -37,9 +37,7 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int yomicmp(u_char* ptr1, u_char* ptr2, u_char* saml) {
yomicmp(u_char *ptr1, u_char *ptr2, u_char *saml)
{
int i, j; int i, j;
int same; int same;
@ -48,30 +46,29 @@ yomicmp(u_char *ptr1, u_char *ptr2, u_char *saml)
i = getplen(ptr2); i = getplen(ptr2);
j = getnlen(ptr2); j = getnlen(ptr2);
if (j == 0) { if(j == 0) {
ptr2 = get_idxptr(prevseg); ptr2 = get_idxptr(prevseg);
for (i = same ; i ; i--) for(i = same; i; i--)
if (*ptr1++ != *ptr2++) return OVER; if(*ptr1++ != *ptr2++) return OVER;
j = sstrlen(ptr2); j = sstrlen(ptr2);
} }
else if (i > same) else if(i > same)
return CONT; return CONT;
else { else {
if (i < same) same = i; if(i < same) same = i;
ptr1 += same; ptr1 += same;
ptr2 += DOUONBLKSIZENUMBER; ptr2 += DOUONBLKSIZENUMBER;
} }
while (j-- > 0) { while(j-- > 0) {
if (*ptr1 > *ptr2) { if(*ptr1 > *ptr2) {
*saml = same; *saml = same;
return CONT; return CONT;
} } else if(*ptr1++ < *ptr2++) {
else if (*ptr1++ < *ptr2++) {
return OVER; return OVER;
} }
same++; same++;
@ -81,24 +78,21 @@ yomicmp(u_char *ptr1, u_char *ptr2, u_char *saml)
return MATCH; return MATCH;
} }
u_char*
u_char * srchdict(u_char* tagp) {
srchdict(u_char *tagp)
{
TypeDicSeg segno; TypeDicSeg segno;
int cmp; int cmp;
int maxlen; int maxlen;
maxlen = (cnvlen > MAXWDYOMILEN) ? MAXWDYOMILEN : cnvlen; maxlen = (cnvlen > MAXWDYOMILEN) ? MAXWDYOMILEN : cnvlen;
while ((int)dicinl <= maxlen) { while((int)dicinl <= maxlen) {
segno = srchidx(prevseg, (int)dicinl); segno = srchidx(prevseg, (int)dicinl);
(*curdict->getdic)(curdict, segno); (*curdict->getdic)(curdict, segno);
if (prevseg != segno) { if(prevseg != segno) {
prevseg = segno; prevseg = segno;
@ -109,11 +103,11 @@ srchdict(u_char *tagp)
tagp = getntag(tagp); tagp = getntag(tagp);
if (segend(tagp)) { if(segend(tagp)) {
prevseg = ++segno; prevseg = ++segno;
if (segno >= curdict->segunit) return NULL; if(segno >= curdict->segunit) return NULL;
(*curdict->getdic)(curdict, segno); (*curdict->getdic)(curdict, segno);
@ -121,23 +115,23 @@ srchdict(u_char *tagp)
} }
} }
if (tagp == dicbuf) { if(tagp == dicbuf) {
get_askknj(); get_askknj();
tagp += *tagp + 1; tagp += *tagp + 1;
} }
while (!segend(tagp)) { while(!segend(tagp)) {
cmp = yomicmp(cnvstart, tagp, &dicsaml); cmp = yomicmp(cnvstart, tagp, &dicsaml);
if ((int)dicsaml > maxlen) return NULL; if((int)dicsaml > maxlen) return NULL;
if (cmp == OVER) if(cmp == OVER)
return NULL; return NULL;
else if (cmp == MATCH) { else if(cmp == MATCH) {
if (isdpnd(*(cnvstart + dicsaml))) { if(isdpnd(*(cnvstart + dicsaml))) {
break; break;
} }
@ -153,4 +147,3 @@ srchdict(u_char *tagp)
return NULL; return NULL;
} }

13
lib/sj3core/srchhead.c
View file

@ -33,29 +33,25 @@
* $SonyDate: 1994/06/03 08:02:28 $ * $SonyDate: 1994/06/03 08:02:28 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_yomi.h" #include "sj_yomi.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int srchhead() {
srchhead() if(*cnvstart == _O) {
{
if (*cnvstart == _O) {
headcode = SETTOU_O; headcode = SETTOU_O;
headlen = 1; headlen = 1;
return TRUE; return TRUE;
} }
else if (*cnvstart == _GO) { else if(*cnvstart == _GO) {
headcode = SETTOU_GO; headcode = SETTOU_GO;
headlen = 1; headlen = 1;
return TRUE; return TRUE;
} }
else if ((*cnvstart == _DA) && (*(cnvstart + 1) == _I)) { else if((*cnvstart == _DA) && (*(cnvstart + 1) == _I)) {
headcode = SETTOU_DAI; headcode = SETTOU_DAI;
headlen = 2; headlen = 2;
return TRUE; return TRUE;
@ -64,4 +60,3 @@ srchhead()
headcode = headlen = 0; headcode = headlen = 0;
return FALSE; return FALSE;
} }

16
lib/sj3core/srchidx.c
View file

@ -38,18 +38,17 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
TypeDicSeg TypeDicSeg
srchidx(TypeDicSeg low, int len) srchidx(TypeDicSeg low, int len) {
{
TypeDicSeg high; TypeDicSeg high;
TypeDicSeg mid; TypeDicSeg mid;
int cmp; int cmp;
u_char *target; u_char* target;
if ((high = curdict->segunit - 1) < 1) return 0; if((high = curdict->segunit - 1) < 1) return 0;
if (low == (TypeDicSeg)-1) low = 0; if(low == (TypeDicSeg)-1) low = 0;
while (low <= high) { while(low <= high) {
mid = (low + high) >> 1; mid = (low + high) >> 1;
@ -57,11 +56,11 @@ srchidx(TypeDicSeg low, int len)
cmp = istrcmp(cnvstart, target, len, sstrlen(target)); cmp = istrcmp(cnvstart, target, len, sstrlen(target));
if (cmp == OVER) { if(cmp == OVER) {
high = mid - 1; high = mid - 1;
} }
else if(cmp != MATCH){ else if(cmp != MATCH) {
low = mid + 1; low = mid + 1;
} }
@ -72,4 +71,3 @@ srchidx(TypeDicSeg low, int len)
return (cmp == OVER && mid != DICSEGBASE) ? mid - 1 : mid; return (cmp == OVER && mid != DICSEGBASE) ? mid - 1 : mid;
} }

330
lib/sj3core/srchnum.c
View file

@ -44,135 +44,128 @@
static void srch_kurai1(), srch_kurai2(); static void srch_kurai1(), srch_kurai2();
static void static void
srch_josuu_sub(JREC *jrec, TypeGram gram) srch_josuu_sub(JREC* jrec, TypeGram gram) {
{ u_char* tagp;
u_char *tagp; DICTL* dp;
DICTL *dp;
for (dp = dictlist ; dp ; dp = dp -> next) { for(dp = dictlist; dp; dp = dp->next) {
curdict = dp -> dict; curdict = dp->dict;
dicinl = 1; dicinl = 1;
dicsaml = 0; dicsaml = 0;
prevseg = -1; prevseg = -1;
while (tagp = srchdict(tagp)) setnumrec(tagp, jrec, gram); while(tagp = srchdict(tagp)) setnumrec(tagp, jrec, gram);
} }
} }
static void static void
srch_josuu(JREC *jrec) srch_josuu(JREC* jrec) {
{ u_char* kp;
u_char *kp;
int klen; int klen;
int len; int len;
if (headcode && headcode != SETTOU_DAI) return; if(headcode && headcode != SETTOU_DAI) return;
kp = cnvstart; kp = cnvstart;
klen = cnvlen; klen = cnvlen;
cnvstart += (len = jrec -> numlen); cnvstart += (len = jrec->numlen);
cnvlen -= len; cnvlen -= len;
srch_josuu_sub(jrec, JOSUUSI); srch_josuu_sub(jrec, JOSUUSI);
if (!headcode) srch_josuu_sub(jrec, JOSUUSI2); if(!headcode) srch_josuu_sub(jrec, JOSUUSI2);
cnvstart = kp; cnvstart = kp;
cnvlen = klen; cnvlen = klen;
} }
static void static void
setnrec_sub(u_char *p, u_short flag, int stb) setnrec_sub(u_char* p, u_short flag, int stb) {
{ JREC* rec;
JREC *rec;
int len1; int len1;
int len2; int len2;
len1 = len2 = p - suuji_yptr; len1 = len2 = p - suuji_yptr;
if (headcode) len1 += headlen; if(headcode) len1 += headlen;
if (stb) len2--; if(stb) len2--;
if ((int)suuji_len == len2) { if((int)suuji_len == len2) {
if (suuji_wkeep) { if(suuji_wkeep) {
memcpy((u_char *)suuji_wkeep, (u_char *)suuji_wbuf, memcpy((u_char*)suuji_wkeep, (u_char*)suuji_wbuf,
sizeof(suuji_wbuf[0]) * NUMWORDBUF); sizeof(suuji_wbuf[0]) * NUMWORDBUF);
} }
if (suuji_ukeep) { if(suuji_ukeep) {
memcpy(suuji_ukeep, suuji_ubuf, NUMKETALENGTH); memcpy(suuji_ukeep, suuji_ubuf, NUMKETALENGTH);
} }
suuji_exit = suuji_keta; suuji_exit = suuji_keta;
return; return;
} }
if (rec = argjrec(len1, (JREC *)NULL)) { if(rec = argjrec(len1, (JREC*)NULL)) {
rec -> class = suuji_class; rec->class = suuji_class;
rec -> hinsi = SUUSI; rec->hinsi = SUUSI;
rec -> sttofs = headcode; rec->sttofs = headcode;
rec -> stbofs = (u_char)stb; rec->stbofs = (u_char)stb;
rec -> flags = flag; rec->flags = flag;
rec -> numlen = (u_char)len2; rec->numlen = (u_char)len2;
if (!stb) srch_josuu(rec); if(!stb) srch_josuu(rec);
} }
} }
static void static void
setnrec(u_char *p, u_short flag) setnrec(u_char* p, u_short flag) {
{
setnrec_sub(p, flag, 0); setnrec_sub(p, flag, 0);
if (!headcode && (*p == Y_S_KIGOU2)) { if(!headcode && (*p == Y_S_KIGOU2)) {
setnrec_sub(p + 1, flag, -1); setnrec_sub(p + 1, flag, -1);
} }
} }
static u_char* static u_char*
srchtbl(u_char ch, u_char *tbl, int rec, int n) srchtbl(u_char ch, u_char* tbl, int rec, int n) {
{
int high, low, mid; int high, low, mid;
u_char *p; u_char* p;
if (!ch) return NULL; if(!ch) return NULL;
low = 0; low = 0;
high = n - 1; high = n - 1;
while (low <= high) { while(low <= high) {
mid = (low + high) / 2; mid = (low + high) / 2;
p = tbl + mid * rec; p = tbl + mid * rec;
if (ch == *p) if(ch == *p)
break; break;
else if (ch < *p) else if(ch < *p)
high = mid - 1; high = mid - 1;
else else
low = mid + 1; low = mid + 1;
} }
if (low > high) return NULL; if(low > high) return NULL;
while (mid-- > 0 && ch == *(p - rec)) p -= rec; while(mid-- > 0 && ch == *(p - rec)) p -= rec;
return p; return p;
} }
static int static int
isconnect(u_char *cnct, int num) isconnect(u_char* cnct, int num) {
{
return (cnct[num / 8] & (0x80 >> (num % 8))); return (cnct[num / 8] & (0x80 >> (num % 8)));
} }
static int static int
string_cmp(u_char *s, int l, u_char *d) string_cmp(u_char* s, int l, u_char* d) {
{ u_char* p;
u_char *p;
p = s; p = s;
while (*s && l-- > 0) { while(*s && l-- > 0) {
if (*s != *d) return 0; if(*s != *d) return 0;
s++; s++;
d++; d++;
} }
@ -181,8 +174,7 @@ string_cmp(u_char *s, int l, u_char *d)
} }
static int static int
check_num(u_char *ptr) check_num(u_char* ptr) {
{
int i; int i;
int j; int j;
int k; int k;
@ -193,35 +185,35 @@ check_num(u_char *ptr)
int cnt; int cnt;
u_short flag; u_short flag;
memset((u_char *)suuji_wbuf, 0, sizeof(u_short) * NUMWORDBUF); memset((u_char*)suuji_wbuf, 0, sizeof(u_short) * NUMWORDBUF);
flag = 0; flag = 0;
hketa = lketa = cnt = 0; hketa = lketa = cnt = 0;
for (i = suuji_keta ; --i >= 0 ;) { for(i = suuji_keta; --i >= 0;) {
if (hketa >= 4) return FALSE; if(hketa >= 4) return FALSE;
tmp = suuji_ubuf[i]; tmp = suuji_ubuf[i];
if (j = ((tmp >> 6) & 3)) { if(j = ((tmp >> 6) & 3)) {
if (j < hketa) return FALSE; if(j < hketa) return FALSE;
if (j > hketa) { if(j > hketa) {
flag |= JFLAG_N01; flag |= JFLAG_N01;
do { do {
suuji_wbuf[hketa] |= (_NUM0<<(lketa*4)); suuji_wbuf[hketa] |= (_NUM0 << (lketa * 4));
if (++lketa >= 4) { if(++lketa >= 4) {
lketa = 0; lketa = 0;
hketa++; hketa++;
} }
} while (j > hketa); } while(j > hketa);
} }
} }
k = ((tmp >> 4) & 3); k = ((tmp >> 4) & 3);
if (j || k) { if(j || k) {
if (k < lketa) return FALSE; if(k < lketa) return FALSE;
if (k > lketa) { if(k > lketa) {
flag |= JFLAG_N01; flag |= JFLAG_N01;
do { do {
suuji_wbuf[hketa] |= (_NUM0<<(lketa*4)); suuji_wbuf[hketa] |= (_NUM0 << (lketa * 4));
lketa++; lketa++;
} while (k > lketa); } while(k > lketa);
} }
flg = TRUE; flg = TRUE;
} }
@ -230,16 +222,16 @@ check_num(u_char *ptr)
cnt++; cnt++;
j = (1 << tmp); j = (1 << tmp);
if (j & NUMBERS1) flag |= JFLAG_NS1; if(j & NUMBERS1) flag |= JFLAG_NS1;
if (j & NUMBER01) flag |= JFLAG_N01; if(j & NUMBER01) flag |= JFLAG_N01;
if (j & NUMBER23) flag |= JFLAG_N23; if(j & NUMBER23) flag |= JFLAG_N23;
if (tmp != _NUM0) { if(tmp != _NUM0) {
flg = FALSE; flg = FALSE;
switch (lketa) { switch(lketa) {
case 0: case 0:
if (tmp == _NUM1) flag |= JFLAG_N_1; if(tmp == _NUM1) flag |= JFLAG_N_1;
break; break;
case 1: case 1:
@ -247,22 +239,22 @@ check_num(u_char *ptr)
break; break;
} }
} }
if (++lketa >= 4) { if(++lketa >= 4) {
lketa = 0; lketa = 0;
hketa++; hketa++;
} }
} }
if (flg) return FALSE; if(flg) return FALSE;
if (suuji_keta == 1 || tmp != _NUM0) flag |= JFLAG_NN0; if(suuji_keta == 1 || tmp != _NUM0) flag |= JFLAG_NN0;
if (hketa) if(hketa)
flag |= (JFLAG_NK4 | JFLAG_NK2); flag |= (JFLAG_NK4 | JFLAG_NK2);
else if (lketa > 1) else if(lketa > 1)
flag |= JFLAG_NK2; flag |= JFLAG_NK2;
if (cnt > 1) flag |= JFLAG_NSN; if(cnt > 1) flag |= JFLAG_NSN;
setnrec(ptr, flag); setnrec(ptr, flag);
@ -270,56 +262,55 @@ check_num(u_char *ptr)
} }
static void static void
srch_number1(u_char *ptr) srch_number1(u_char* ptr) {
{
u_char ch; u_char ch;
u_char mode; u_char mode;
u_char *p; u_char* p;
int l; int l;
TypeClass cls; TypeClass cls;
int len; int len;
u_char *tptr; u_char* tptr;
if (suuji_keta >= NUMKETALENGTH) return; if(suuji_keta >= NUMKETALENGTH) return;
if (!(p = srchtbl((ch = *ptr), Suuji_tbl, SJTBLRECLEN, SJTBLRECNUM))) if(!(p = srchtbl((ch = *ptr), Suuji_tbl, SJTBLRECLEN, SJTBLRECNUM)))
return; return;
len = suuji_yptr + MAXCLINPUTLEN - ptr; len = suuji_yptr + MAXCLINPUTLEN - ptr;
for ( ; *SjTblYPos(p) == ch ; p += SJTBLRECLEN) { for(; *SjTblYPos(p) == ch; p += SJTBLRECLEN) {
if (!(l = string_cmp(SjTblYPos(p), SJTBLYLEN, ptr))) continue; if(!(l = string_cmp(SjTblYPos(p), SJTBLYLEN, ptr))) continue;
if (l > len) continue; if(l > len) continue;
mode = *SjTblModeP(p); mode = *SjTblModeP(p);
suuji_ubuf[suuji_keta++] = SjTblNumber(mode); suuji_ubuf[suuji_keta++] = SjTblNumber(mode);
tptr = ptr + l; tptr = ptr + l;
switch (suuji_class) { switch(suuji_class) {
case C_N_ARABIA: case C_N_ARABIA:
if (!(mode & SJTBLNARABIAF)) break; if(!(mode & SJTBLNARABIAF)) break;
check_num(tptr); check_num(tptr);
srch_number1(tptr); srch_number1(tptr);
srch_kurai2(tptr, (u_char *)NULL); srch_kurai2(tptr, (u_char*)NULL);
break; break;
case C_N_SUUJI: case C_N_SUUJI:
if (mode & (SJTBLNARABIAF | SJTBLNYOMIF)) break; if(mode & (SJTBLNARABIAF | SJTBLNYOMIF)) break;
check_num(tptr); check_num(tptr);
srch_number1(tptr); srch_number1(tptr);
srch_kurai1(tptr, (u_char *)NULL); srch_kurai1(tptr, (u_char*)NULL);
srch_kurai2(tptr, (u_char *)NULL); srch_kurai2(tptr, (u_char*)NULL);
break; break;
case C_N_KAZU: case C_N_KAZU:
case C_N_NANSUU: case C_N_NANSUU:
if (mode & SJTBLNNARABIF) break; if(mode & SJTBLNNARABIF) break;
if (mode & SJTBLNNANSUUF) { if(mode & SJTBLNNANSUUF) {
cls = suuji_class; cls = suuji_class;
suuji_class = C_N_NANSUU; suuji_class = C_N_NANSUU;
} }
@ -328,32 +319,29 @@ srch_number1(u_char *ptr)
srch_kurai1(tptr, SjTblCnctP(p)); srch_kurai1(tptr, SjTblCnctP(p));
srch_kurai2(tptr, SjTblCnctP(p)); srch_kurai2(tptr, SjTblCnctP(p));
if (mode & SJTBLNNANSUUF) suuji_class = cls; if(mode & SJTBLNNANSUUF) suuji_class = cls;
break; break;
default: default:
if (mode & SJTBLNARABIAF) { if(mode & SJTBLNARABIAF) {
suuji_class = C_N_ARABIA; suuji_class = C_N_ARABIA;
check_num(tptr); check_num(tptr);
srch_number1(tptr); srch_number1(tptr);
srch_kurai2(tptr, (u_char *)NULL); srch_kurai2(tptr, (u_char*)NULL);
suuji_class = C_N_KAZU; suuji_class = C_N_KAZU;
} } else if(mode & SJTBLNYOMIF) {
else if (mode & SJTBLNYOMIF) { if(mode & SJTBLNNANSUUF)
if (mode & SJTBLNNANSUUF)
suuji_class = C_N_NANSUU; suuji_class = C_N_NANSUU;
else else
suuji_class = C_N_KAZU; suuji_class = C_N_KAZU;
check_num(tptr); check_num(tptr);
} } else if(mode & SJTBLNNARABIF) {
else if (mode & SJTBLNNARABIF) {
suuji_class = C_N_SUUJI; suuji_class = C_N_SUUJI;
check_num(tptr); check_num(tptr);
srch_number1(tptr); srch_number1(tptr);
break; break;
} } else {
else {
suuji_class = C_N_SUUJI; suuji_class = C_N_SUUJI;
srch_number1(tptr); srch_number1(tptr);
@ -370,35 +358,33 @@ srch_number1(u_char *ptr)
} }
static void static void
srch_kurai1(u_char *ptr, u_char *cnct) srch_kurai1(u_char* ptr, u_char* cnct) {
{
u_char ch; u_char ch;
u_char *p; u_char* p;
int l; int l;
int keta; int keta;
int mode; int mode;
TypeClass cls; TypeClass cls;
int len; int len;
u_char *tptr; u_char* tptr;
if (!(p = srchtbl((ch = *ptr), Kurai1_tbl, KR1TBLRECLEN, KR1TBLRECNUM))) if(!(p = srchtbl((ch = *ptr), Kurai1_tbl, KR1TBLRECLEN, KR1TBLRECNUM)))
return; return;
len = suuji_yptr + MAXCLINPUTLEN - ptr; len = suuji_yptr + MAXCLINPUTLEN - ptr;
for ( ; *Kr1TblYPos(p) == ch ; p += KR1TBLRECLEN) { for(; *Kr1TblYPos(p) == ch; p += KR1TBLRECLEN) {
if (!(l = string_cmp(Kr1TblYPos(p), KR1TBLYLEN, ptr))) continue; if(!(l = string_cmp(Kr1TblYPos(p), KR1TBLYLEN, ptr))) continue;
if (l > len) continue; if(l > len) continue;
mode = *Kr1TblModeP(p); mode = *Kr1TblModeP(p);
keta = Kr1TblKeta(mode); keta = Kr1TblKeta(mode);
tptr = ptr + l; tptr = ptr + l;
if (suuji_class != C_N_KAZU && suuji_class != C_N_NANSUU) { if(suuji_class != C_N_KAZU && suuji_class != C_N_NANSUU) {
cls = suuji_class; cls = suuji_class;
suuji_class = (suuji_class == C_N_ARABIA) ? suuji_class = (suuji_class == C_N_ARABIA) ? C_N_ARAKURA : C_N_KANKURA;
C_N_ARAKURA : C_N_KANKURA;
suuji_ubuf[suuji_keta - 1] |= (keta << 4); suuji_ubuf[suuji_keta - 1] |= (keta << 4);
check_num(tptr); check_num(tptr);
suuji_class = cls; suuji_class = cls;
@ -406,23 +392,22 @@ srch_kurai1(u_char *ptr, u_char *cnct)
continue; continue;
} }
if (cnct) { if(cnct) {
if (!isconnect(cnct, (int)Kr1TblCnct(mode))) continue; if(!isconnect(cnct, (int)Kr1TblCnct(mode))) continue;
suuji_ubuf[suuji_keta - 1] |= (keta << 4); suuji_ubuf[suuji_keta - 1] |= (keta << 4);
} } else {
else { if(!Kr1TblTop(mode)) continue;
if (!Kr1TblTop(mode)) continue; if(suuji_keta >= NUMKETALENGTH) continue;
if (suuji_keta >= NUMKETALENGTH) continue;
suuji_ubuf[suuji_keta++] = (_NUM1 | (keta << 4)); suuji_ubuf[suuji_keta++] = (_NUM1 | (keta << 4));
} }
check_num(tptr); check_num(tptr);
srch_number1(tptr); srch_number1(tptr);
srch_kurai1(tptr, (u_char *)NULL); srch_kurai1(tptr, (u_char*)NULL);
srch_kurai2(tptr, Kr1TblCnctP(p)); srch_kurai2(tptr, Kr1TblCnctP(p));
if (cnct) if(cnct)
suuji_ubuf[suuji_keta - 1] &= 0xcf; suuji_ubuf[suuji_keta - 1] &= 0xcf;
else else
suuji_keta--; suuji_keta--;
@ -430,59 +415,56 @@ srch_kurai1(u_char *ptr, u_char *cnct)
} }
static void static void
srch_kurai2(u_char *ptr, u_char *cnct) srch_kurai2(u_char* ptr, u_char* cnct) {
{
u_char ch; u_char ch;
u_char *p; u_char* p;
int l; int l;
int keta; int keta;
int mode; int mode;
TypeClass cls; TypeClass cls;
int len; int len;
u_char *tptr; u_char* tptr;
if ((suuji_ubuf[0] & 0x0f) == _NUM0) return; if((suuji_ubuf[0] & 0x0f) == _NUM0) return;
if (!(p = srchtbl((ch = *ptr), Kurai2_tbl, KR2TBLRECLEN, KR2TBLRECNUM))) if(!(p = srchtbl((ch = *ptr), Kurai2_tbl, KR2TBLRECLEN, KR2TBLRECNUM)))
return; return;
len = suuji_yptr + MAXCLINPUTLEN - ptr; len = suuji_yptr + MAXCLINPUTLEN - ptr;
for ( ; *Kr2TblYPos(p) == ch ; p += KR2TBLRECLEN) { for(; *Kr2TblYPos(p) == ch; p += KR2TBLRECLEN) {
if (!(l = string_cmp(Kr2TblYPos(p), KR2TBLYLEN, ptr))) continue; if(!(l = string_cmp(Kr2TblYPos(p), KR2TBLYLEN, ptr))) continue;
if (l > len) continue; if(l > len) continue;
mode = *Kr2TblModeP(p); mode = *Kr2TblModeP(p);
keta = Kr2TblKeta(mode); keta = Kr2TblKeta(mode);
tptr = ptr + l; tptr = ptr + l;
if (suuji_class != C_N_KAZU && suuji_class != C_N_NANSUU) { if(suuji_class != C_N_KAZU && suuji_class != C_N_NANSUU) {
suuji_ubuf[suuji_keta - 1] |= (keta << 6); suuji_ubuf[suuji_keta - 1] |= (keta << 6);
cls = suuji_class; cls = suuji_class;
suuji_class = (suuji_class == C_N_ARABIA) ? suuji_class = (suuji_class == C_N_ARABIA) ? C_N_ARAKURA : C_N_KANKURA;
C_N_ARAKURA : C_N_KANKURA;
check_num(tptr); check_num(tptr);
suuji_class = cls; suuji_class = cls;
suuji_ubuf[suuji_keta - 1] &= 0x3f; suuji_ubuf[suuji_keta - 1] &= 0x3f;
continue; continue;
} }
if (cnct) { if(cnct) {
if (!isconnect(cnct, (int)Kr2TblCnct(mode))) continue; if(!isconnect(cnct, (int)Kr2TblCnct(mode))) continue;
suuji_ubuf[suuji_keta - 1] |= (keta << 6); suuji_ubuf[suuji_keta - 1] |= (keta << 6);
} } else {
else { if(suuji_keta >= NUMKETALENGTH) continue;
if (suuji_keta >= NUMKETALENGTH) continue;
suuji_ubuf[suuji_keta++] = (_NUM1 | (keta << 6)); suuji_ubuf[suuji_keta++] = (_NUM1 | (keta << 6));
} }
check_num(tptr); check_num(tptr);
srch_number1(tptr); srch_number1(tptr);
srch_kurai1(tptr, (u_char *)NULL); srch_kurai1(tptr, (u_char*)NULL);
if (cnct) if(cnct)
suuji_ubuf[suuji_keta - 1] &= 0x3f; suuji_ubuf[suuji_keta - 1] &= 0x3f;
else else
suuji_keta--; suuji_keta--;
@ -490,53 +472,47 @@ srch_kurai2(u_char *ptr, u_char *cnct)
} }
static void static void
srch_number2(u_char *p) srch_number2(u_char* p) {
{
u_char ch; u_char ch;
int i; int i;
suuji_class = (*p == N_0) ? C_N_SUUJILONG : C_N_KAZULONG; suuji_class = (*p == N_0) ? C_N_SUUJILONG : C_N_KAZULONG;
suuji_keta = suuji_comma = 0; suuji_keta = suuji_comma = 0;
for (i = 0 ; i < MAXCLINPUTLEN ; i++) { for(i = 0; i < MAXCLINPUTLEN; i++) {
if ((ch = *p++) == Y_COMMA) { if((ch = *p++) == Y_COMMA) {
if (suuji_keta) { if(suuji_keta) {
if (suuji_comma) { if(suuji_comma) {
if (suuji_comma != 3) break; if(suuji_comma != 3) break;
} else {
if(suuji_keta >= 4) break;
if(*suuji_yptr == N_0) break;
} }
else { } else
if (suuji_keta >= 4) break;
if (*suuji_yptr == N_0) break;
}
}
else
break; break;
suuji_comma = 1; suuji_comma = 1;
ch = *p++; ch = *p++;
} } else if(suuji_comma) {
else if (suuji_comma) {
suuji_comma++; suuji_comma++;
} }
if (suuji_comma > 3) break; if(suuji_comma > 3) break;
if (!(Chrtbl[ch] & NUMBER)) break; if(!(Chrtbl[ch] & NUMBER)) break;
if (suuji_keta < NUMKETALENGTH) { if(suuji_keta < NUMKETALENGTH) {
suuji_ubuf[suuji_keta] = ch - N_0 + _NUM0; suuji_ubuf[suuji_keta] = ch - N_0 + _NUM0;
} }
suuji_keta++; suuji_keta++;
if (!suuji_comma && suuji_keta > NUMKETALENGTH) { if(!suuji_comma && suuji_keta > NUMKETALENGTH) {
setnrec(p, 0); setnrec(p, 0);
} } else if(suuji_comma == 3) {
else if (suuji_comma == 3) { if(suuji_keta <= NUMKETALENGTH) {
if (suuji_keta <= NUMKETALENGTH) {
suuji_class = C_N_ARACMA; suuji_class = C_N_ARACMA;
check_num(p); check_num(p);
} } else {
else {
suuji_class = C_N_KAZULCMA; suuji_class = C_N_KAZULCMA;
setnrec(p, 0); setnrec(p, 0);
} }
@ -545,8 +521,7 @@ srch_number2(u_char *p)
} }
static void static void
srchnum_sub(u_char *p) srchnum_sub(u_char* p) {
{
suuji_yptr = p; suuji_yptr = p;
suuji_comma = suuji_keta = 0; suuji_comma = suuji_keta = 0;
@ -555,20 +530,18 @@ srchnum_sub(u_char *p)
suuji_keta = 0; suuji_keta = 0;
suuji_class = C_N_KAZU; suuji_class = C_N_KAZU;
srch_kurai1(p, (u_char *)NULL); srch_kurai1(p, (u_char*)NULL);
if (suuji_exit) return; if(suuji_exit) return;
srch_number2(p); srch_number2(p);
} }
void void srchnum() {
srchnum()
{
suuji_len = suuji_exit = 0; suuji_len = suuji_exit = 0;
srchnum_sub(cnvstart); srchnum_sub(cnvstart);
if (!headcode && (*cnvstart == Y_S_KIGOU1)) { if(!headcode && (*cnvstart == Y_S_KIGOU1)) {
headcode = SETTOU_KIGOU; headcode = SETTOU_KIGOU;
headlen = 1; headlen = 1;
@ -578,9 +551,7 @@ srchnum()
} }
} }
void void setwdnum(u_char* p, int len, u_short* wd) {
setwdnum(u_char *p, int len, u_short *wd)
{
suuji_len = (u_char)len; suuji_len = (u_char)len;
suuji_wkeep = wd; suuji_wkeep = wd;
suuji_ukeep = NULL; suuji_ukeep = NULL;
@ -590,9 +561,7 @@ setwdnum(u_char *p, int len, u_short *wd)
srchnum_sub(p); srchnum_sub(p);
} }
int int setucnum(u_char* p, int len, u_char* ud) {
setucnum(u_char *p, int len, u_char *ud)
{
suuji_len = (u_char)len; suuji_len = (u_char)len;
suuji_wkeep = NULL; suuji_wkeep = NULL;
suuji_ukeep = ud; suuji_ukeep = ud;
@ -603,4 +572,3 @@ setucnum(u_char *p, int len, u_char *ud)
return (int)suuji_exit; return (int)suuji_exit;
} }

10
lib/sj3core/sstrcmp.c
View file

@ -33,18 +33,14 @@
* $SonyDate: 1994/06/03 08:02:31 $ * $SonyDate: 1994/06/03 08:02:31 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int sstrcmp(u_char* src, u_char* dst) {
sstrcmp(u_char *src, u_char *dst) for(; *src; src++, dst++)
{ if(*src != *dst) break;
for ( ; *src ; src++, dst++)
if (*src != *dst) break;
return (*src - *dst); return (*src - *dst);
} }

11
lib/sj3core/sstrlen.c
View file

@ -33,22 +33,17 @@
* $SonyDate: 1994/06/03 08:02:32 $ * $SonyDate: 1994/06/03 08:02:32 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int sstrlen(u_char* ptr) {
sstrlen(u_char *ptr) u_char* head;
{
u_char *head;
head = ptr; head = ptr;
while (*ptr) ptr++; while(*ptr) ptr++;
return (ptr - head); return (ptr - head);
} }

15
lib/sj3core/sstrncmp.c
View file

@ -33,25 +33,21 @@
* $SonyDate: 1994/06/03 08:02:33 $ * $SonyDate: 1994/06/03 08:02:33 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_const.h" #include "sj_const.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int sstrncmp(u_char* src, u_char* dst, int len) {
sstrncmp(u_char *src, u_char *dst, int len)
{
while (len-- > 0) { while(len-- > 0) {
if (*src > *dst) if(*src > *dst)
return CONT; return CONT;
if (*src < *dst) { if(*src < *dst) {
if (!*src) return PARTLY; if(!*src) return PARTLY;
return OVER; return OVER;
} }
src++; src++;
@ -60,4 +56,3 @@ sstrncmp(u_char *src, u_char *dst, int len)
return MATCH; return MATCH;
} }

52
lib/sj3core/stbtbl.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:02:34 $ * $SonyDate: 1994/06/03 08:02:34 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_yomi.h" #include "sj_yomi.h"
@ -56,8 +53,7 @@ static u_char name_stb[] = {
0xa4, 0xc1, 0xa4, 0xe3, 0xa4, 0xf3, 0xa4, 0xc1, 0xa4, 0xe3, 0xa4, 0xf3,
0x22, MEISI_1, _DO, _NO, 0x22, MEISI_1, _DO, _NO,
0xc5, 0xc2, 0xc5, 0xc2,
0x00 0x00};
};
static u_char timei_stb[] = { static u_char timei_stb[] = {
0x22, MEISI_1, _E, _KI, 0x22, MEISI_1, _E, _KI,
@ -78,8 +74,7 @@ static u_char timei_stb[] = {
0xc4, 0xae, 0xc4, 0xae,
0x22, MEISI_1, _MU, _RA, 0x22, MEISI_1, _MU, _RA,
0xc2, 0xbc, 0xc2, 0xbc,
0x00 0x00};
};
static u_char meisi_stb[] = { static u_char meisi_stb[] = {
0x44, MEISI_6, _A, _TU, _KA, _I, 0x44, MEISI_6, _A, _TU, _KA, _I,
@ -94,8 +89,7 @@ static u_char meisi_stb[] = {
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6, 0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6,
0x22, MEISI_8, _HU, _U, 0x22, MEISI_8, _HU, _U,
0xc9, 0xf7, 0xc9, 0xf7,
0x00 0x00};
};
static u_char sahen_stb[] = { static u_char sahen_stb[] = {
0x44, MEISI_6, _A, _TU, _KA, _I, 0x44, MEISI_6, _A, _TU, _KA, _I,
@ -120,28 +114,44 @@ static u_char sahen_stb[] = {
0xc9, 0xf7, 0xc9, 0xf7,
0x22, MEISI_11, _MA, _E, 0x22, MEISI_11, _MA, _E,
0xc1, 0xb0, 0xc1, 0xb0,
0x00 0x00};
};
static u_char human_stb[] = { static u_char human_stb[] = {
0x24, MEISI_1, _SA, _NN, 0x24, MEISI_1, _SA, _NN,
0xa4, 0xb5, 0xa4, 0xf3, 0xa4, 0xb5, 0xa4, 0xf3,
0x00 0x00};
};
static u_char ippan_stb[] = { static u_char ippan_stb[] = {
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _I, 0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _I,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa4, 0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa4,
0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _U, 0x56, FUKUSI_1, _NI, _TO, _MO, _NA, _U,
0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6, 0xa4, 0xcb, 0xc8, 0xbc, 0xa4, 0xa6,
0x00 0x00};
};
u_char *stbadr[] = { u_char* stbadr[] = {
0, 0,
ippan_stb, ippan_stb, ippan_stb, meisi_stb, sahen_stb, ippan_stb,
sahen_stb, sahen_stb, meisi_stb, meisi_stb, meisi_stb, ippan_stb,
ippan_stb, ippan_stb, human_stb, ippan_stb, ippan_stb, ippan_stb,
ippan_stb, ippan_stb, ippan_stb, 0, 0, meisi_stb,
name_stb, name_stb, 0, timei_stb, sahen_stb,
sahen_stb,
sahen_stb,
meisi_stb,
meisi_stb,
meisi_stb,
ippan_stb,
ippan_stb,
human_stb,
ippan_stb,
ippan_stb,
ippan_stb,
ippan_stb,
ippan_stb,
0,
0,
name_stb,
name_stb,
0,
timei_stb,
}; };

35
lib/sj3core/stttbl.c
View file

@ -33,58 +33,39 @@
* $SonyDate: 1994/06/03 08:02:37 $ * $SonyDate: 1994/06/03 08:02:37 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
static u_char o_settou[] = { static u_char o_settou[] = {
0xA1, 0xb8, 0xe6, 0xa4, 0xaa 0xA1, 0xb8, 0xe6, 0xa4, 0xaa};
};
static u_char go_settou[] = { static u_char go_settou[] = {
0xA1, 0xb8, 0xe6, 0xa4, 0xb4 0xA1, 0xb8, 0xe6, 0xa4, 0xb4};
};
static u_char dai_settou[] = { static u_char dai_settou[] = {
0x22, 0xc2, 0xe8, 0xc2, 0xe8 0x22, 0xc2, 0xe8, 0xc2, 0xe8};
};
static u_char kigou_settou[] = { static u_char kigou_settou[] = {
0x01 0x01};
};
u_char *settou_ptr[] = {
NULL, o_settou, go_settou, dai_settou, kigou_settou
};
u_char* settou_ptr[] = {
NULL, o_settou, go_settou, dai_settou, kigou_settou};
u_char scncttbl[2][24] = { u_char scncttbl[2][24] = {
{ {
0x48, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x18, 0x18, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0xff, 0x18, 0x18, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0xff,
0x00, 0x1f, 0xf0, 0x00, 0xff, 0x00, 0x00, 0x00},
0x00, 0x1f, 0xf0, 0x00, 0xff, 0x00, 0x00, 0x00
},
{ {
0x22, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
}
};

123
lib/sj3core/study.c
View file

@ -37,12 +37,10 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int study(STDYOUT* stdy) {
study(STDYOUT *stdy)
{
STDYOUT outp; STDYOUT outp;
STDYIN *p1; STDYIN* p1;
STDYIN *p2; STDYIN* p2;
int wcnt; int wcnt;
int ret; int ret;
TypeDicSeg seg; TypeDicSeg seg;
@ -50,83 +48,83 @@ study(STDYOUT *stdy)
TypeStyNum nm; TypeStyNum nm;
TypeStyNum wi; TypeStyNum wi;
if (!StudyExist()) return STUDYNODICT; if(!StudyExist()) return STUDYNODICT;
memcpy((u_char *)&outp, (u_char *)stdy, sizeof(outp)); memcpy((u_char*)&outp, (u_char*)stdy, sizeof(outp));
if (outp.stdy1.offset == 0) return STUDYNOTSTUDY; if(outp.stdy1.offset == 0) return STUDYNOTSTUDY;
p1 = srchstdy(outp.stdy1.seg, outp.stdy1.offset, outp.stdy1.dicid); p1 = srchstdy(outp.stdy1.seg, outp.stdy1.offset, outp.stdy1.dicid);
if (p1) { if(p1) {
nm = p1 -> styno; nm = p1->styno;
for (wcnt = STUDYCOUNT, p2 = STUDYDICT ; wcnt-- ; p2++) { for(wcnt = STUDYCOUNT, p2 = STUDYDICT; wcnt--; p2++) {
if (p2 -> styno < nm) p2 -> styno++; if(p2->styno < nm) p2->styno++;
} }
p1 -> styno = 1; p1->styno = 1;
if (outp.sttfg) p1 -> sttkj = outp.stdy1.sttkj; if(outp.sttfg) p1->sttkj = outp.stdy1.sttkj;
if (outp.ka_fg) p1 -> ka_kj = outp.stdy1.ka_kj; if(outp.ka_fg) p1->ka_kj = outp.stdy1.ka_kj;
p1 -> nmflg = outp.stdy1.nmflg; p1->nmflg = outp.stdy1.nmflg;
putstydic(); putstydic();
return STUDYNORMEND; return STUDYNORMEND;
} }
if(STUDYCOUNT >= STUDYMAX) {
if (STUDYCOUNT >= STUDYMAX) { p1 = STUDYDICT;
p2 = NULL;
p1 = STUDYDICT; p2 = NULL; wi = 0; wi = 0;
for (wcnt = STUDYMAX ; wcnt-- ; p1++) { for(wcnt = STUDYMAX; wcnt--; p1++) {
if ((nm = p1 -> styno + 1) > wi) { if((nm = p1->styno + 1) > wi) {
wi = nm; wi = nm;
p2 = p1; p2 = p1;
} }
p1 -> styno = nm; p1->styno = nm;
} }
if (p2) { if(p2) {
mvmemi((u_char *)(p2 + 1), (u_char *)p2, mvmemi((u_char*)(p2 + 1), (u_char*)p2,
(STUDYTAIL - p2) * STUDYRECSIZE); (STUDYTAIL - p2) * STUDYRECSIZE);
STUDYCOUNT -= 1; STUDYCOUNT -= 1;
} } else
else
return STUDYERROR; return STUDYERROR;
ret = STUDYFULLAREA; ret = STUDYFULLAREA;
} } else {
else {
p1 = STUDYDICT; p1 = STUDYDICT;
for (wcnt = STUDYCOUNT ; wcnt-- ; p1++) p1 -> styno++; for(wcnt = STUDYCOUNT; wcnt--; p1++) p1->styno++;
ret = STUDYNORMEND; ret = STUDYNORMEND;
} }
p1 = STUDYDICT; p1 = STUDYDICT;
seg = outp.stdy1.seg; seg = outp.stdy1.seg;
for (wcnt = STUDYCOUNT ; wcnt && (p1 -> seg < seg) ; ) { for(wcnt = STUDYCOUNT; wcnt && (p1->seg < seg);) {
wcnt--; p1++; wcnt--;
}
ofs = outp.stdy1.offset;
while (wcnt-- && (p1 -> seg == seg)) {
if (p1 -> offset > ofs) break;
p1++; p1++;
} }
mvmemd((u_char *)(STUDYTAIL - 1), (u_char *)STUDYTAIL, ofs = outp.stdy1.offset;
(u_char *)(STUDYTAIL - 1) - (u_char *)p1); while(wcnt-- && (p1->seg == seg)) {
p1 -> offset = outp.stdy1.offset; if(p1->offset > ofs) break;
p1 -> seg = outp.stdy1.seg; p1++;
p1 -> dicid = outp.stdy1.dicid; }
p1 -> styno = 1;
p1 -> sttkj = (outp.sttfg) ? outp.stdy1.sttkj : 0; mvmemd((u_char*)(STUDYTAIL - 1), (u_char*)STUDYTAIL,
p1 -> ka_kj = (outp.ka_fg) ? outp.stdy1.ka_kj : 0; (u_char*)(STUDYTAIL - 1) - (u_char*)p1);
p1 -> nmflg = outp.stdy1.nmflg; p1->offset = outp.stdy1.offset;
p1->seg = outp.stdy1.seg;
p1->dicid = outp.stdy1.dicid;
p1->styno = 1;
p1->sttkj = (outp.sttfg) ? outp.stdy1.sttkj : 0;
p1->ka_kj = (outp.ka_fg) ? outp.stdy1.ka_kj : 0;
p1->nmflg = outp.stdy1.nmflg;
STUDYCOUNT += 1; STUDYCOUNT += 1;
putstydic(); putstydic();
@ -134,54 +132,51 @@ study(STDYOUT *stdy)
return ret; return ret;
} }
STDYIN * STDYIN*
srchstdy(TypeDicSeg seg, TypeDicOfs ofs, TypeDicID dicid) srchstdy(TypeDicSeg seg, TypeDicOfs ofs, TypeDicID dicid) {
{
int high; int high;
int mid; int mid;
int low; int low;
STDYIN *ptr; STDYIN* ptr;
if(!StudyExist()) return NULL;
if (!StudyExist()) return NULL; if(!STUDYCOUNT || !ofs) return NULL;
if (!STUDYCOUNT || !ofs) return NULL;
low = 0; low = 0;
high = STUDYCOUNT - 1; high = STUDYCOUNT - 1;
for ( ; ; ) { for(;;) {
mid = ((low + high) >> 1); mid = ((low + high) >> 1);
if (STUDYDICT[mid].seg > seg) if(STUDYDICT[mid].seg > seg)
high = mid - 1; high = mid - 1;
else if (STUDYDICT[mid].seg < seg) else if(STUDYDICT[mid].seg < seg)
low = mid + 1; low = mid + 1;
else else
break; break;
if (low > high) return NULL; if(low > high) return NULL;
} }
low = mid + 1; low = mid + 1;
ptr = &STUDYDICT[mid]; ptr = &STUDYDICT[mid];
while (ptr -> seg == seg) { while(ptr->seg == seg) {
if (ptr -> offset < ofs) break; if(ptr->offset < ofs) break;
if (ptr -> dicid == dicid && ptr -> offset == ofs) return ptr; if(ptr->dicid == dicid && ptr->offset == ofs) return ptr;
if (!mid--) break; if(!mid--) break;
ptr--; ptr--;
} }
ptr = &STUDYDICT[low]; ptr = &STUDYDICT[low];
mid = STUDYCOUNT - low; mid = STUDYCOUNT - low;
while (mid-- && ptr -> seg == seg) { while(mid-- && ptr->seg == seg) {
if (ptr -> offset > ofs) break; if(ptr->offset > ofs) break;
if (ptr -> dicid == dicid && ptr -> offset == ofs) return ptr; if(ptr->dicid == dicid && ptr->offset == ofs) return ptr;
ptr++; ptr++;
} }
return NULL; return NULL;
} }

140
lib/sj3core/suujitbl.c
View file

@ -33,9 +33,6 @@
* $SonyDate: 1994/06/03 08:02:39 $ * $SonyDate: 1994/06/03 08:02:39 $
*/ */
#include "sj_const.h" #include "sj_const.h"
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
@ -49,72 +46,61 @@
#define NN SJTBLNNARABIF #define NN SJTBLNNARABIF
#define NS SJTBLNNANSUUF #define NS SJTBLNNANSUUF
u_char suuji_tbl[] = { u_char suuji_tbl[] = {
N_0,_NIL,_NIL, _NUM0 | NA, 0x00, 0x00, N_0, _NIL, _NIL, _NUM0 | NA, 0x00, 0x00,
N_1,_NIL,_NIL, _NUM1 | NA, 0xec, 0x07, N_1, _NIL, _NIL, _NUM1 | NA, 0xec, 0x07,
N_2,_NIL,_NIL, _NUM2 | NA, 0xec, 0x07, N_2, _NIL, _NIL, _NUM2 | NA, 0xec, 0x07,
N_3,_NIL,_NIL, _NUM3 | NA, 0xff, 0x07, N_3, _NIL, _NIL, _NUM3 | NA, 0xff, 0x07,
N_4,_NIL,_NIL, _NUM4 | NA, 0xec, 0x07, N_4, _NIL, _NIL, _NUM4 | NA, 0xec, 0x07,
N_5,_NIL,_NIL, _NUM5 | NA, 0xec, 0x07, N_5, _NIL, _NIL, _NUM5 | NA, 0xec, 0x07,
N_6,_NIL,_NIL, _NUM6 | NA, 0xec, 0xc7, N_6, _NIL, _NIL, _NUM6 | NA, 0xec, 0xc7,
N_7,_NIL,_NIL, _NUM7 | NA, 0xec, 0x07, N_7, _NIL, _NIL, _NUM7 | NA, 0xec, 0x07,
N_8,_NIL,_NIL, _NUM8 | NA, 0xec, 0xc7, N_8, _NIL, _NIL, _NUM8 | NA, 0xec, 0xc7,
N_9,_NIL,_NIL, _NUM9 | NA, 0xec, 0x07, N_9, _NIL, _NIL, _NUM9 | NA, 0xec, 0x07,
_I, _TI, _NIL, _NUM1, 0x00, 0x05, _I, _TI, _NIL, _NUM1, 0x00, 0x05,
_I, _XTU,_NIL, _NUM1S | NY, 0x20, 0x02, _I, _XTU, _NIL, _NUM1S | NY, 0x20, 0x02,
_KI,_XYU,_U, _NUM9, 0xec, 0x07, _KI, _XYU, _U, _NUM9, 0xec, 0x07,
_KU,_NIL,_NIL, _NUM9 | NY, 0x00, 0x00, _KU, _NIL, _NIL, _NUM9 | NY, 0x00, 0x00,
_GO,_NIL,_NIL, _NUM5, 0xec, 0x07, _GO, _NIL, _NIL, _NUM5, 0xec, 0x07,
_GO,_U, _NIL, _NUM5 | NN, 0x00, 0x00, _GO, _U, _NIL, _NUM5 | NN, 0x00, 0x00,
_SA,_NN, _NIL, _NUM3, 0xd3, 0x07, _SA, _NN, _NIL, _NUM3, 0xd3, 0x07,
_SI,_NIL,_NIL, _NUM4 | NY, 0x80, 0x00, _SI, _NIL, _NIL, _NUM4 | NY, 0x80, 0x00,
_SI,_I, _NIL, _NUM4 | NN, 0x00, 0x00, _SI, _I, _NIL, _NUM4 | NN, 0x00, 0x00,
_SI,_TI, _NIL, _NUM7, 0xec, 0x07, _SI, _TI, _NIL, _NUM7, 0xec, 0x07,
_SU,_U, _NIL, _NUMS | NY | NS, 0xec, 0x07, _SU, _U, _NIL, _NUMS | NY | NS, 0xec, 0x07,
_ZE,_RO, _NIL, _NUM0 | NN, 0x00, 0x00, _ZE, _RO, _NIL, _NUM0 | NN, 0x00, 0x00,
_NA,_NA, _NIL, _NUM7, 0xec, 0x07, _NA, _NA, _NIL, _NUM7, 0xec, 0x07,
_NA,_NN, _NIL, _NUMN | NY | NS, 0xf3, 0x07, _NA, _NN, _NIL, _NUMN | NY | NS, 0xf3, 0x07,
_NI,_NIL,_NIL, _NUM2, 0xec, 0x07, _NI, _NIL, _NIL, _NUM2, 0xec, 0x07,
_NI,_I, _NIL, _NUM2 | NN, 0x00, 0x00, _NI, _I, _NIL, _NUM2 | NN, 0x00, 0x00,
_HA,_TI, _NIL, _NUM8, 0xc0, 0x05, _HA, _TI, _NIL, _NUM8, 0xc0, 0x05,
_HA,_XTU,_NIL, _NUM8 | NY, 0x20, 0xc2, _HA, _XTU, _NIL, _NUM8 | NY, 0x20, 0xc2,
_MA,_RU, _NIL, _NUM0 | NN, 0x00, 0x00, _MA, _RU, _NIL, _NUM0 | NN, 0x00, 0x00,
_YO,_NIL,_NIL, _NUM4 | NY, 0x00, 0x00, _YO, _NIL, _NIL, _NUM4 | NY, 0x00, 0x00,
_YO,_NN, _NIL, _NUM4, 0xec, 0x07, _YO, _NN, _NIL, _NUM4, 0xec, 0x07,
_RE,_I, _NIL, _NUM0 | NN, 0xec, 0x00, _RE, _I, _NIL, _NUM0 | NN, 0xec, 0x00,
_RO,_KU, _NIL, _NUM6, 0xe0, 0x07, _RO, _KU, _NIL, _NUM6, 0xe0, 0x07,
_RO,_XTU,_NIL, _NUM6 | NY, 0x00, 0xc2, _RO, _XTU, _NIL, _NUM6 | NY, 0x00, 0xc2,
0 0};
};
u_char kurai1_tbl[] = { u_char kurai1_tbl[] = {
_ZI,_XYU,_U, (1<<4)+0+KR1TBLTOPF, 0x05, _ZI, _XYU, _U, (1 << 4) + 0 + KR1TBLTOPF, 0x05,
_ZI,_XYU,_XTU, (1<<4)+1+KR1TBLTOPF, 0x02, _ZI, _XYU, _XTU, (1 << 4) + 1 + KR1TBLTOPF, 0x02,
_SE,_NN, _NIL, (3<<4)+2+KR1TBLTOPF, 0x07, _SE, _NN, _NIL, (3 << 4) + 2 + KR1TBLTOPF, 0x07,
_ZE,_NN, _NIL, (3<<4)+3, 0x05, _ZE, _NN, _NIL, (3 << 4) + 3, 0x05,
_HI,_XYA,_KU, (2<<4)+4+KR1TBLTOPF, 0x07, _HI, _XYA, _KU, (2 << 4) + 4 + KR1TBLTOPF, 0x07,
_HI,_XYA,_XTU, (2<<4)+5+KR1TBLTOPF, 0x02, _HI, _XYA, _XTU, (2 << 4) + 5 + KR1TBLTOPF, 0x02,
_BI,_XYA,_KU, (2<<4)+6, 0x07, _BI, _XYA, _KU, (2 << 4) + 6, 0x07,
_BI,_XYA,_XTU, (2<<4)+7, 0x00, _BI, _XYA, _XTU, (2 << 4) + 7, 0x00,
_PI,_XYA,_KU, (2<<4)+8, 0x07, _PI, _XYA, _KU, (2 << 4) + 8, 0x07,
_PI,_XYA,_XTU, (2<<4)+9, 0x00, _PI, _XYA, _XTU, (2 << 4) + 9, 0x00,
0 0};
};
u_char kurai2_tbl[] = { u_char kurai2_tbl[] = {
_O, _KU, _NIL, (2<<4)+13, _O, _KU, _NIL, (2 << 4) + 13,
_TI,_XYO,_U, (3<<4)+14, _TI, _XYO, _U, (3 << 4) + 14,
_MA,_NN, _NIL, (1<<4)+15, _MA, _NN, _NIL, (1 << 4) + 15,
0 0};
};
u_char num1tbl[] = { u_char num1tbl[] = {
0xa3, 0xb0, 0xa3, 0xb0,
@ -129,10 +115,7 @@ u_char num1tbl[] = {
0xa3, 0xb9, 0xa3, 0xb9,
0xa3, 0xb1, 0xa3, 0xb1,
0xbf, 0xf4, 0xbf, 0xf4,
0xb2, 0xbf 0xb2, 0xbf};
};
u_char num2tbl[] = { u_char num2tbl[] = {
0xa1, 0xbb, 0xa1, 0xbb,
@ -147,10 +130,7 @@ u_char num2tbl[] = {
0xb6, 0xe5, 0xb6, 0xe5,
0xb0, 0xec, 0xb0, 0xec,
0xbf, 0xf4, 0xbf, 0xf4,
0xb2, 0xbf 0xb2, 0xbf};
};
u_char num3tbl[] = { u_char num3tbl[] = {
0xce, 0xed, 0xce, 0xed,
@ -165,32 +145,22 @@ u_char num3tbl[] = {
0xb6, 0xe5, 0xb6, 0xe5,
0xb0, 0xed, 0xb0, 0xed,
0xbf, 0xf4, 0xbf, 0xf4,
0xb2, 0xbf 0xb2, 0xbf};
};
u_char num4tbl[] = { u_char num4tbl[] = {
0xc0, 0xe9, 0xc0, 0xe9,
0xc9, 0xb4, 0xc9, 0xb4,
0xbd, 0xbd, 0xbd, 0xbd,
0 0};
};
u_char num5tbl[] = { u_char num5tbl[] = {
0xc0, 0xe9, 0xc0, 0xe9,
0xc9, 0xb4, 0xc9, 0xb4,
0xbd, 0xa6, 0xbd, 0xa6,
0 0};
};
u_char num6tbl[] = { u_char num6tbl[] = {
0xc3, 0xfb, 0xc3, 0xfb,
0xb2, 0xaf, 0xb2, 0xaf,
0xcb, 0xfc, 0xcb, 0xfc,
0 0};
};

25
lib/sj3core/terminat.c
View file

@ -33,40 +33,33 @@
* $SonyDate: 1994/06/03 08:02:40 $ * $SonyDate: 1994/06/03 08:02:40 $
*/ */
#include "sj_kcnv.h" #include "sj_kcnv.h"
#include "sj_right.h" #include "sj_right.h"
#include "sj_kanakan.h" #include "sj_kanakan.h"
int int terminate(TypeCnct right, u_char* yomi) {
terminate(TypeCnct right, u_char *yomi)
{
u_char ch; u_char ch;
if((yomi > cnvstart) && (Chrtbl[*(yomi - 1)] & NUMBER))
if ((yomi > cnvstart) && (Chrtbl[*(yomi - 1)] & NUMBER))
return TRUE; return TRUE;
ch = *yomi; ch = *yomi;
if (Termtbl[right] & T_SHUUJO) { if(Termtbl[right] & T_SHUUJO) {
if (!ch) return TRUE; if(!ch) return TRUE;
if (Chrtbl[ch] & FZKTOP) return FALSE; if(Chrtbl[ch] & FZKTOP) return FALSE;
if (!isdpnd(ch)) return SHU; if(!isdpnd(ch)) return SHU;
} }
if (Termtbl[right] & T_KANOU) { if(Termtbl[right] & T_KANOU) {
if (ch && (Chrtbl[ch] & FZKTOP)) return FALSE; if(ch && (Chrtbl[ch] & FZKTOP)) return FALSE;
if (!isdpnd(ch)) return TRUE; if(!isdpnd(ch)) return TRUE;
} }
return FALSE; return FALSE;
} }

19
lib/sj3core/termtbl.c
View file

@ -33,8 +33,6 @@
* $SonyDate: 1994/06/03 08:02:42 $ * $SonyDate: 1994/06/03 08:02:42 $
*/ */
#include "sj_rename.h" #include "sj_rename.h"
#include "sj_typedef.h" #include "sj_typedef.h"
#include "sj_const.h" #include "sj_const.h"
@ -124,7 +122,7 @@ u_char termtbl[] = {
T_KANOU + P_RENYOU_F, T_KANOU + P_RENYOU_F,
T_KANOU + P_RENYOU_F, T_KANOU + P_RENYOU_F,
T_KANOU + P_RENYOU_F, T_KANOU + P_RENYOU_F,
T_SHUUJO+ P_SHUUSI, T_SHUUJO + P_SHUUSI,
T_KANOU + P_SHUUSI, T_KANOU + P_SHUUSI,
T_KANOU + P_SHUUSI, T_KANOU + P_SHUUSI,
T_KANOU + P_SHUUSI, T_KANOU + P_SHUUSI,
@ -144,7 +142,7 @@ u_char termtbl[] = {
T_KANOU + RENTAI + 6, T_KANOU + RENTAI + 6,
T_KANOU + RENTAI + 6, T_KANOU + RENTAI + 6,
T_SHUUJO+ RENTAI + 6, T_SHUUJO + RENTAI + 6,
T_KANOU + RENTAI + 6, T_KANOU + RENTAI + 6,
T_KANOU + RENTAI + 7, T_KANOU + RENTAI + 7,
T_KANOU + RENTAI + 6, T_KANOU + RENTAI + 6,
@ -162,8 +160,8 @@ u_char termtbl[] = {
T_KANOU + P_KAMEI, T_KANOU + P_KAMEI,
T_KANOU + P_MEIREI, T_KANOU + P_MEIREI,
T_KANOU + P_MEIREI, T_KANOU + P_MEIREI,
T_SHUUJO+ P_MEIREI, T_SHUUJO + P_MEIREI,
T_SHUUJO+ P_MEIREI, T_SHUUJO + P_MEIREI,
T_KANOU + P_MEISI, T_KANOU + P_MEISI,
0 + P_FUKA, 0 + P_FUKA,
@ -184,7 +182,7 @@ u_char termtbl[] = {
T_KANOU + P_DAIMEISI, T_KANOU + P_DAIMEISI,
T_KANOU + 7, T_KANOU + 7,
0 + P_FUKA, 0 + P_FUKA,
T_SHUUJO+ P_JOSHI_E, T_SHUUJO + P_JOSHI_E,
T_KANOU + P_JOSHI_B, T_KANOU + P_JOSHI_B,
T_KANOU + P_JOSHI_A, T_KANOU + P_JOSHI_A,
@ -212,7 +210,7 @@ u_char termtbl[] = {
0 + P_FUKA, 0 + P_FUKA,
0 + P_FUKA, 0 + P_FUKA,
0 + P_FUKA, 0 + P_FUKA,
T_SHUUJO+ P_SHUUSI, T_SHUUJO + P_SHUUSI,
T_KANOU + P_JOSHI_C, T_KANOU + P_JOSHI_C,
T_KANOU + 1, T_KANOU + 1,
T_KANOU + P_JOSHI_F, T_KANOU + P_JOSHI_F,
@ -285,7 +283,7 @@ u_char termtbl[] = {
T_KANOU + P_JOSHI_C, T_KANOU + P_JOSHI_C,
T_KANOU + P_JOSHI_C, T_KANOU + P_JOSHI_C,
T_SHUUJO+ P_SHUUSI, T_SHUUJO + P_SHUUSI,
T_KANOU + P_JOSHI_C, T_KANOU + P_JOSHI_C,
T_KANOU + P_JOSHI_C, T_KANOU + P_JOSHI_C,
T_KANOU + P_JOSHI_C, T_KANOU + P_JOSHI_C,
@ -323,5 +321,4 @@ u_char termtbl[] = {
T_KANOU + P_SETUBI, T_KANOU + P_SETUBI,
T_KANOU + P_JOSUUSI, T_KANOU + P_JOSUUSI,
T_KANOU + P_RENTAISI, T_KANOU + P_RENTAISI,
T_KANOU + P_TANKAN T_KANOU + P_TANKAN};
};

61
lib/sj3core/wakachi.c
View file

@ -39,15 +39,13 @@
#include "sj_kanakan.h" #include "sj_kanakan.h"
void void wakachi() {
wakachi() JREC* jrec;
{ CLREC* clrec;
JREC *jrec;
CLREC *clrec;
CREC crec[4]; CREC crec[4];
int count; int count;
u_char *next; u_char* next;
TypeCnct right; TypeCnct right;
int i; int i;
int maxlen; int maxlen;
@ -58,49 +56,47 @@ wakachi()
maxlen = (cnvlen > MAXCLINPUTLEN) ? MAXCLINPUTLEN : cnvlen; maxlen = (cnvlen > MAXCLINPUTLEN) ? MAXCLINPUTLEN : cnvlen;
next = cnvstart; next = cnvstart;
if (Chrtbl[*next] & (TAI_KGU | FZK_KGU)) { if(Chrtbl[*next] & (TAI_KGU | FZK_KGU)) {
while (*next && (Chrtbl[*next] & (TAI_KGU | FZK_KGU))) while(*next && (Chrtbl[*next] & (TAI_KGU | FZK_KGU)))
next++; next++;
if ((i = next - cnvstart) > maxlen) { if((i = next - cnvstart) > maxlen) {
next = cnvstart + maxlen; next = cnvstart + maxlen;
i = maxlen; i = maxlen;
} }
if (!(jrec = argjrec(i, (JREC *)NULL))) return; if(!(jrec = argjrec(i, (JREC*)NULL))) return;
jrec -> class = C_WAKACHI; jrec->class = C_WAKACHI;
jrec -> hinsi = D_MEISI_1; jrec->hinsi = D_MEISI_1;
if (Chrtbl[*(next - 1)] & TAI_KGU) if(Chrtbl[*(next - 1)] & TAI_KGU)
srchfzk(jrec, next, R_DAIMEISI, 0); srchfzk(jrec, next, R_DAIMEISI, 0);
} }
else { else {
if (!(jrec = argjrec(0, (JREC *)NULL))) return; if(!(jrec = argjrec(0, (JREC*)NULL))) return;
jrec -> class = C_WAKACHI; jrec->class = C_WAKACHI;
jrec -> hinsi = MEISI_6; jrec->hinsi = MEISI_6;
while ((int)jrec -> jlen < maxlen) { while((int)jrec->jlen < maxlen) {
count = setconj((TypeGram)MEISI_6, jrec, crec); count = setconj((TypeGram)MEISI_6, jrec, crec);
for (i = count ; i-- > 0 ; ) { for(i = count; i-- > 0;) {
right = crec[i].right; right = crec[i].right;
gobilen = crec[i].len; gobilen = crec[i].len;
next = cnvstart + jrec->jlen + gobilen; next = cnvstart + jrec->jlen + gobilen;
if (gobilen) { if(gobilen) {
if (terminate(right, next)) { if(terminate(right, next)) {
fzk_ka_flg = 0; fzk_ka_flg = 0;
setclrec(jrec, next, right); setclrec(jrec, next, right);
} }
} } else if((Chrtbl[*next] & NUMBER) && (jrec->jlen)) {
else if ((Chrtbl[*next] & NUMBER)
&& (jrec -> jlen)) {
fzk_ka_flg = 0; fzk_ka_flg = 0;
setclrec(jrec, next, right); setclrec(jrec, next, right);
return; return;
@ -109,22 +105,21 @@ wakachi()
srchfzk(jrec, next, right, 0); srchfzk(jrec, next, right, 0);
} }
if (maxclptr) break; if(maxclptr) break;
(jrec -> jlen)++; (jrec->jlen)++;
} }
} }
if ((maxclptr) && (Chrtbl[*(cnvstart + jrec -> jlen)] & FZKTOP)) if((maxclptr) && (Chrtbl[*(cnvstart + jrec->jlen)] & FZKTOP))
return; return;
if (jrec -> jlen) { if(jrec->jlen) {
if (clrec = argclrec((int)jrec -> jlen)) { if(clrec = argclrec((int)jrec->jlen)) {
clrec -> jnode = jrec; clrec->jnode = jrec;
clrec -> right = R_MEISI; clrec->right = R_MEISI;
clrec -> kubun = K_TAIGEN; clrec->kubun = K_TAIGEN;
(jrec -> count)++; (jrec->count)++;
} }
} }
} }

749
lib/sj3rkcv/rk_conv.c
View file

File diff suppressed because it is too large Load diff

563
lib/sj3rkcv/sj3_rkcv.c
View file

@ -33,7 +33,6 @@
* $SonyDate: 1995/02/10 06:02:25 $ * $SonyDate: 1995/02/10 06:02:25 $
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -70,22 +69,22 @@ static u_short HKtable[ZKATAn] = {
KANA_XA + 4, KANA_A + 4, KANA_XA + 4, KANA_A + 4,
KANA_KA, KANA_GA, KANA_KA, KANA_GA,
KANA_KA + 1, KANA_GA + (1<<8), KANA_KA + 1, KANA_GA + (1 << 8),
KANA_KA + 2, KANA_GA + (2<<8), KANA_KA + 2, KANA_GA + (2 << 8),
KANA_KA + 3, KANA_GA + (3<<8), KANA_KA + 3, KANA_GA + (3 << 8),
KANA_KA + 4, KANA_GA + (4<<8), KANA_KA + 4, KANA_GA + (4 << 8),
KANA_SA, KANA_ZA, KANA_SA, KANA_ZA,
KANA_SA + 1, KANA_ZA + (1<<8), KANA_SA + 1, KANA_ZA + (1 << 8),
KANA_SA + 2, KANA_ZA + (2<<8), KANA_SA + 2, KANA_ZA + (2 << 8),
KANA_SA + 3, KANA_ZA + (3<<8), KANA_SA + 3, KANA_ZA + (3 << 8),
KANA_SA + 4, KANA_ZA + (4<<8), KANA_SA + 4, KANA_ZA + (4 << 8),
KANA_TA, KANA_DA, KANA_TA, KANA_DA,
KANA_TA + 1, KANA_DA + (1<<8), KANA_TA + 1, KANA_DA + (1 << 8),
KANA_XTSU, KANA_TA + 2, KANA_DA + (2<<8), KANA_XTSU, KANA_TA + 2, KANA_DA + (2 << 8),
KANA_TA + 3, KANA_DA + (3<<8), KANA_TA + 3, KANA_DA + (3 << 8),
KANA_TA + 4, KANA_DA + (4<<8), KANA_TA + 4, KANA_DA + (4 << 8),
KANA_NA, KANA_NA,
KANA_NA + 1, KANA_NA + 1,
@ -94,10 +93,10 @@ static u_short HKtable[ZKATAn] = {
KANA_NA + 4, KANA_NA + 4,
KANA_HA, KANA_BA, KANA_PA, KANA_HA, KANA_BA, KANA_PA,
KANA_HA + 1, KANA_BA + (1<<8), KANA_PA + (1<<8), KANA_HA + 1, KANA_BA + (1 << 8), KANA_PA + (1 << 8),
KANA_HA + 2, KANA_BA + (2<<8), KANA_PA + (2<<8), KANA_HA + 2, KANA_BA + (2 << 8), KANA_PA + (2 << 8),
KANA_HA + 3, KANA_BA + (3<<8), KANA_PA + (3<<8), KANA_HA + 3, KANA_BA + (3 << 8), KANA_PA + (3 << 8),
KANA_HA + 4, KANA_BA + (4<<8), KANA_PA + (4<<8), KANA_HA + 4, KANA_BA + (4 << 8), KANA_PA + (4 << 8),
KANA_MA, KANA_MA,
KANA_MA + 1, KANA_MA + 1,
@ -121,10 +120,9 @@ static u_short HKtable[ZKATAn] = {
KANA_WO, KANA_WO,
KANA_WA + 1, KANA_WA + 1,
((KANA_A+2)<<8) + KANA_DTEN, ((KANA_A + 2) << 8) + KANA_DTEN,
KANA_KA, KANA_KA,
KANA_KA + 3 KANA_KA + 3};
};
static struct ztohkktbl { static struct ztohkktbl {
u_short zen; u_short zen;
@ -137,9 +135,7 @@ static struct ztohkktbl {
ZEN_CTEN, KANA_CTEN, ZEN_CTEN, KANA_CTEN,
ZEN_CHOUON, KANA_CHOUON, ZEN_CHOUON, KANA_CHOUON,
ZEN_DTEN, KANA_DTEN, ZEN_DTEN, KANA_DTEN,
ZEN_HDTEN, KANA_HDTEN ZEN_HDTEN, KANA_HDTEN};
};
static struct hzkigoutbl { static struct hzkigoutbl {
wchar16_t han; wchar16_t han;
@ -150,8 +146,7 @@ static struct hzkigoutbl {
'-', ZEN_CHOUON, '-', ZEN_CHOUON,
'@', ZEN_CTEN, '@', ZEN_CTEN,
'[', ZEN_FKAKKO, '[', ZEN_FKAKKO,
']', ZEN_EKAKKO ']', ZEN_EKAKKO};
};
static u_short HZtbl[95] = { static u_short HZtbl[95] = {
0xa1a1, 0xa1aa, 0xa1c9, 0xa1f4, 0xa1f0, 0xa1f3, 0xa1f5, 0xa1c7, 0xa1a1, 0xa1aa, 0xa1c9, 0xa1f4, 0xa1f0, 0xa1f3, 0xa1f5, 0xa1c7,
@ -165,13 +160,10 @@ static u_short HZtbl[95] = {
0xa1c6, 0xa3e1, 0xa3e2, 0xa3e3, 0xa3e4, 0xa3e5, 0xa3e6, 0xa3e7, 0xa1c6, 0xa3e1, 0xa3e2, 0xa3e3, 0xa3e4, 0xa3e5, 0xa3e6, 0xa3e7,
0xa3e8, 0xa3e9, 0xa3ea, 0xa3eb, 0xa3ec, 0xa3ed, 0xa3ee, 0xa3ef, 0xa3e8, 0xa3e9, 0xa3ea, 0xa3eb, 0xa3ec, 0xa3ed, 0xa3ee, 0xa3ef,
0xa3f0, 0xa3f1, 0xa3f2, 0xa3f3, 0xa3f4, 0xa3f5, 0xa3f6, 0xa3f7, 0xa3f0, 0xa3f1, 0xa3f2, 0xa3f3, 0xa3f4, 0xa3f5, 0xa3f6, 0xa3f7,
0xa3f8, 0xa3f9, 0xa3fa, 0xa1d0, 0xa1c3, 0xa1d1, 0xa1b1 0xa3f8, 0xa3f9, 0xa3fa, 0xa1d0, 0xa1c3, 0xa1d1, 0xa1b1};
};
#ifdef ADDHK #ifdef ADDHK
void void setl_hktozh() {
setl_hktozh()
{
int i; int i;
u_short c, zen1; u_short c, zen1;
wchar16_t rstr[2]; wchar16_t rstr[2];
@ -183,34 +175,31 @@ setl_hktozh()
kstr[1] = 0; kstr[1] = 0;
for(i = 0; i < ZKATAn - 3; i++) { for(i = 0; i < ZKATAn - 3; i++) {
c = HKtable[i]; c = HKtable[i];
if (!(c & RKZEN)) { if(!(c & RKZEN)) {
rstr[0] = c; rstr[0] = c;
if ((rktp = mktable(rstr, 1)) == NULL) if((rktp = mktable(rstr, 1)) == NULL)
break; break;
if (rktp->k_yomi != NULL) if(rktp->k_yomi != NULL)
continue; continue;
kstr[0] = zen1 + (ZHIRAF2 + i); kstr[0] = zen1 + (ZHIRAF2 + i);
if (kstradd(&(rktp->k_yomi), kstr, 2) == -1) if(kstradd(&(rktp->k_yomi), kstr, 2) == -1)
break; break;
} }
} }
for (i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
rstr[0] = HKKtbl[i].han; rstr[0] = HKKtbl[i].han;
if ((rktp = mktable(rstr, 1)) == NULL) if((rktp = mktable(rstr, 1)) == NULL)
break; break;
if (rktp->k_yomi != NULL) if(rktp->k_yomi != NULL)
continue; continue;
kstr[0] = HKKtbl[i].zen; kstr[0] = HKKtbl[i].zen;
if (kstradd(&(rktp->k_yomi), kstr, 2) == -1) if(kstradd(&(rktp->k_yomi), kstr, 2) == -1)
break; break;
} }
} }
#endif #endif
void mkkigou() {
void
mkkigou()
{
int i; int i;
wchar16_t rstr[2]; wchar16_t rstr[2];
wchar16_t kstr[2]; wchar16_t kstr[2];
@ -218,283 +207,267 @@ mkkigou()
rstr[1] = '\0'; rstr[1] = '\0';
kstr[1] = 0; kstr[1] = 0;
for (i = 0; i < 6; i++) { for(i = 0; i < 6; i++) {
rstr[0] = HZKtbl[i].han; rstr[0] = HZKtbl[i].han;
if ((rktp = mktable(rstr, 1)) == NULL) if((rktp = mktable(rstr, 1)) == NULL)
break; break;
if (rktp->k_yomi != NULL) if(rktp->k_yomi != NULL)
continue; continue;
kstr[0] = HZKtbl[i].zen; kstr[0] = HZKtbl[i].zen;
if (kstradd(&(rktp->k_yomi), kstr, 2) == -1) if(kstradd(&(rktp->k_yomi), kstr, 2) == -1)
break; break;
} }
} }
int int sj_addten(u_short prefix, u_short c) {
sj_addten(u_short prefix, u_short c)
{
u_short c1, cc; u_short c1, cc;
cc = 0; cc = 0;
if ((c == ZEN_DTEN || c == ZEN_HDTEN) && if((c == ZEN_DTEN || c == ZEN_HDTEN) &&
(sj_ishira(prefix) || sj_iskata(prefix))) { (sj_ishira(prefix) || sj_iskata(prefix))) {
c1 = sj_zen2han(prefix); c1 = sj_zen2han(prefix);
if ((c1 >= KANA_KA && c1 < KANA_NA) || if((c1 >= KANA_KA && c1 < KANA_NA) ||
(c1 >= KANA_HA && c1 < KANA_MA)) { (c1 >= KANA_HA && c1 < KANA_MA)) {
if (c == ZEN_DTEN) if(c == ZEN_DTEN)
cc = prefix + 1; cc = prefix + 1;
else if (c == ZEN_HDTEN && c1 >= KANA_HA) else if(c == ZEN_HDTEN && c1 >= KANA_HA)
cc = prefix + 2; cc = prefix + 2;
} else if (c1 == KANA_A+2 && sj_iskata(prefix)&& c == ZEN_DTEN) } else if(c1 == KANA_A + 2 && sj_iskata(prefix) && c == ZEN_DTEN)
cc = ZEN_VU; cc = ZEN_VU;
} }
return(cc); return (cc);
} }
int int sj_han2zen(u_short c) {
sj_han2zen(u_short c)
{
int i; int i;
u_short cc; u_short cc;
if (WcIsHANKAKU(c) && iskana2(c)) { if(WcIsHANKAKU(c) && iskana2(c)) {
for (i = 0; i < ZKATAn; i++) { for(i = 0; i < ZKATAn; i++) {
if (c == HKtable[i]) { if(c == HKtable[i]) {
if (i >= ZKATAn - 3) { if(i >= ZKATAn - 3) {
cc = (ZKATA1 << 8) + (ZKATAF2 + i + 1); cc = (ZKATA1 << 8) + (ZKATAF2 + i + 1);
} } else {
else {
cc = (ZHIRA1 << 8) + (ZHIRAF2 + i); cc = (ZHIRA1 << 8) + (ZHIRAF2 + i);
if (c == KANA_WA) if(c == KANA_WA)
cc++; cc++;
} }
break; break;
} }
} }
if (i >= ZKATAn) { if(i >= ZKATAn) {
for (i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
if (c == HKKtbl[i].han) { if(c == HKKtbl[i].han) {
cc = HKKtbl[i].zen; cc = HKKtbl[i].zen;
break; break;
} }
} }
if (i >= 8) if(i >= 8)
cc = ZEN_SPACE; cc = ZEN_SPACE;
} }
} else { } else {
if (c >= 0x20 && c <= 0x7e) if(c >= 0x20 && c <= 0x7e)
cc = HZtbl[c - 0x20]; cc = HZtbl[c - 0x20];
else else
cc = c; cc = c;
} }
return(cc); return (cc);
} }
int sj3_hantozen(u_char* out, u_char* in) {
int
sj3_hantozen(u_char *out, u_char *in)
{
wchar16_t *winstr, *woutstr; wchar16_t *winstr, *woutstr;
u_char *mstr; u_char* mstr;
int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret;
inlen = strlen(in) + 1; inlen = strlen(in) + 1;
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
if (inlen > sizeof(mtmp)) { if(inlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(inlen); mstr = (u_char*)malloc(inlen);
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
if (sjistoeuc(mstr, inlen, in, inlen) < 0) { if(sjistoeuc(mstr, inlen, in, inlen) < 0) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
} else { } else {
mstr = in; mstr = in;
} }
if ((inlen * sizeof(wchar16_t)) > sizeof(intmp)) { if((inlen * sizeof(wchar16_t)) > sizeof(intmp)) {
winstr = (wchar16_t *) malloc(inlen * sizeof(wchar16_t)); winstr = (wchar16_t*)malloc(inlen * sizeof(wchar16_t));
if (!winstr) { if(!winstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
imflag = 1; imflag = 1;
} else { } else {
winstr = (wchar16_t *) intmp; winstr = (wchar16_t*)intmp;
} }
if (mbstowcs(winstr, (char *)mstr, inlen) == -1) { if(mbstowcs(winstr, (char*)mstr, inlen) == -1) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
outlen = inlen; outlen = inlen;
if ((outlen * sizeof(wchar16_t)) > sizeof(outtmp)) { if((outlen * sizeof(wchar16_t)) > sizeof(outtmp)) {
woutstr = (wchar16_t *) malloc(outlen * sizeof(wchar16_t)); woutstr = (wchar16_t*)malloc(outlen * sizeof(wchar16_t));
if (!woutstr) { if(!woutstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
omflag = 1; omflag = 1;
} else { } else {
woutstr = (wchar16_t *) outtmp; woutstr = (wchar16_t*)outtmp;
} }
ret = sj3_hantozen_w16(woutstr, winstr); ret = sj3_hantozen_w16(woutstr, winstr);
if (mmflag) { if(mmflag) {
free(mstr); free(mstr);
mmflag = 0; mmflag = 0;
} }
if (ret == 0 || ret == -1) { if(ret == 0 || ret == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return ret; return ret;
} }
outlen = ret * 3; outlen = ret * 3;
if (outlen > sizeof(mtmp)) { if(outlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(outlen); mstr = (u_char*)malloc(outlen);
if (!mstr) { if(!mstr) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return -1; return -1;
} }
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
if (wcstombs((char *)mstr, woutstr, outlen) == -1) { if(wcstombs((char*)mstr, woutstr, outlen) == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
inlen = euctosjis(out, outlen, mstr, outlen); inlen = euctosjis(out, outlen, mstr, outlen);
} else { } else {
(void) memcpy(out, mstr, strlen(mstr) + 1); (void)memcpy(out, mstr, strlen(mstr) + 1);
} }
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (inlen > 0) { if(inlen > 0) {
return ret; return ret;
} else { } else {
return inlen; return inlen;
} }
} }
int int sj3_hantozen_euc(u_char* out, u_char* in) {
sj3_hantozen_euc(u_char *out, u_char *in)
{
wchar16_t *winstr, *woutstr; wchar16_t *winstr, *woutstr;
u_char *mstr; u_char* mstr;
int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret;
inlen = strlen(in) + 1; inlen = strlen(in) + 1;
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
mstr = in; mstr = in;
} else { } else {
if (inlen > sizeof(mtmp)) { if(inlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(inlen); mstr = (u_char*)malloc(inlen);
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
if (euctosjis(mstr, inlen, in, inlen) < 0) { if(euctosjis(mstr, inlen, in, inlen) < 0) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
} }
if ((inlen * sizeof(wchar16_t)) > sizeof(intmp)) { if((inlen * sizeof(wchar16_t)) > sizeof(intmp)) {
winstr = (wchar16_t *) malloc(inlen * sizeof(wchar16_t)); winstr = (wchar16_t*)malloc(inlen * sizeof(wchar16_t));
if (!winstr) { if(!winstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
imflag = 1; imflag = 1;
} else { } else {
winstr = (wchar16_t *) intmp; winstr = (wchar16_t*)intmp;
} }
if (mbstowcs(winstr, (char *)mstr, inlen) == -1) { if(mbstowcs(winstr, (char*)mstr, inlen) == -1) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
outlen = inlen; outlen = inlen;
if ((outlen * sizeof(wchar16_t)) > sizeof(outtmp)) { if((outlen * sizeof(wchar16_t)) > sizeof(outtmp)) {
woutstr = (wchar16_t *) malloc(outlen * sizeof(wchar16_t)); woutstr = (wchar16_t*)malloc(outlen * sizeof(wchar16_t));
if (!woutstr) { if(!woutstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
omflag = 1; omflag = 1;
} else { } else {
woutstr = (wchar16_t *) outtmp; woutstr = (wchar16_t*)outtmp;
} }
ret = sj3_hantozen_w16(woutstr, winstr); ret = sj3_hantozen_w16(woutstr, winstr);
if (mmflag) { if(mmflag) {
free(mstr); free(mstr);
mmflag = 0; mmflag = 0;
} }
if (ret == 0 || ret == -1) { if(ret == 0 || ret == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return ret; return ret;
} }
outlen = ret * 3; outlen = ret * 3;
if (outlen > sizeof(mtmp)) { if(outlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(outlen); mstr = (u_char*)malloc(outlen);
if (!mstr) { if(!mstr) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return -1; return -1;
} }
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
if (wcstombs((char *)mstr, woutstr, outlen) == -1) { if(wcstombs((char*)mstr, woutstr, outlen) == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
(void) memcpy(out, mstr, strlen(mstr) + 1); (void)memcpy(out, mstr, strlen(mstr) + 1);
} else { } else {
inlen = sjistoeuc(out, outlen, mstr, outlen); inlen = sjistoeuc(out, outlen, mstr, outlen);
} }
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (inlen > 0) { if(inlen > 0) {
return ret; return ret;
} else { } else {
return inlen; return inlen;
} }
} }
int int sj3_hantozen_mb(u_char* s1, u_char* s2) {
sj3_hantozen_mb(u_char *s1, u_char *s2) if(current_locale == LC_CTYPE_EUC)
{
if (current_locale == LC_CTYPE_EUC)
return sj3_hantozen_euc(s1, s2); return sj3_hantozen_euc(s1, s2);
else else
return sj3_hantozen(s1, s2); return sj3_hantozen(s1, s2);
} }
int int sj3_hantozen_w16(wchar16_t* s1, wchar16_t* s2) {
sj3_hantozen_w16(wchar16_t *s1, wchar16_t *s2)
{
return sj_hantozen(s1, s2, wslen(s2)); return sj_hantozen(s1, s2, wslen(s2));
} }
int int sj_hantozen(wchar16_t* s1, wchar16_t* s2, int len) {
sj_hantozen(wchar16_t *s1, wchar16_t *s2, int len)
{
u_short c1, cc, prefix; u_short c1, cc, prefix;
wchar16_t c; wchar16_t c;
int i; int i;
@ -502,11 +475,11 @@ sj_hantozen(wchar16_t *s1, wchar16_t *s2, int len)
prefix = 0; prefix = 0;
rlen = 0; rlen = 0;
for (i = 0; i < len && *s2 != '\0'; i++) { for(i = 0; i < len && *s2 != '\0'; i++) {
c = *s2++; c = *s2++;
cc = sj_han2zen(c); cc = sj_han2zen(c);
if (cc & RKZEN) { if(cc & RKZEN) {
if (prefix != 0 && (c1 = sj_addten(prefix, cc)) != 0) { if(prefix != 0 && (c1 = sj_addten(prefix, cc)) != 0) {
s1 -= 1; s1 -= 1;
rlen -= 1; rlen -= 1;
cc = c1; cc = c1;
@ -514,7 +487,7 @@ sj_hantozen(wchar16_t *s1, wchar16_t *s2, int len)
} else } else
prefix = cc; prefix = cc;
*s1++ = cc; *s1++ = cc;
rlen ++; rlen++;
} else { } else {
*s1++ = cc; *s1++ = cc;
rlen++; rlen++;
@ -522,106 +495,102 @@ sj_hantozen(wchar16_t *s1, wchar16_t *s2, int len)
} }
} }
*s1 = '\0'; *s1 = '\0';
return(rlen); return (rlen);
} }
int int sj_zen2han(u_short c) {
sj_zen2han(u_short c)
{
int i; int i;
u_short cc; u_short cc;
i = ZKATAn; i = ZKATAn;
cc = c & MASK; cc = c & MASK;
if (sj_ishira(c)) if(sj_ishira(c))
i = cc - ZHIRAF2; i = cc - ZHIRAF2;
else if (sj_iskata(c)) { else if(sj_iskata(c)) {
i = cc - ZKATAF2; i = cc - ZKATAF2;
} }
if (i < ZKATAn) if(i < ZKATAn)
cc = HKtable[i]; cc = HKtable[i];
else { else {
for (i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
if (c == HKKtbl[i].zen) { if(c == HKKtbl[i].zen) {
cc = HKKtbl[i].han; cc = HKKtbl[i].han;
break; break;
} }
} }
if (i >= 8) { if(i >= 8) {
cc = c; cc = c;
for (i = 0; i < 95; i++) { for(i = 0; i < 95; i++) {
if (c == HZtbl[i]) { if(c == HZtbl[i]) {
cc = i + 0x20; cc = i + 0x20;
break; break;
} }
} }
} }
} }
return(cc); return (cc);
} }
int int sj3_zentohan(u_char* out, u_char* in) {
sj3_zentohan(u_char *out, u_char *in)
{
wchar16_t *winstr, *woutstr; wchar16_t *winstr, *woutstr;
u_char *mstr; u_char* mstr;
int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret;
inlen = strlen(in) + 1; inlen = strlen(in) + 1;
if (inlen > sizeof(mtmp)) { if(inlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(inlen); mstr = (u_char*)malloc(inlen);
if (!mstr) { if(!mstr) {
return -1; return -1;
} }
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
(void) euctosjis(mstr, inlen, in, inlen); (void)euctosjis(mstr, inlen, in, inlen);
} else { } else {
(void) memcpy(mstr, in, inlen); (void)memcpy(mstr, in, inlen);
} }
if (inlen > sizeof(intmp)) { if(inlen > sizeof(intmp)) {
winstr = (wchar16_t *) malloc(((inlen / 2) + 1) * sizeof(wchar16_t)); winstr = (wchar16_t*)malloc(((inlen / 2) + 1) * sizeof(wchar16_t));
if (!winstr) { if(!winstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
imflag = 1; imflag = 1;
} else { } else {
winstr = (wchar16_t *) intmp; winstr = (wchar16_t*)intmp;
} }
if (mbstowcs(winstr, (char *)mstr, inlen) == -1) { if(mbstowcs(winstr, (char*)mstr, inlen) == -1) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
if (mmflag) { if(mmflag) {
free(mstr); free(mstr);
mmflag = 0; mmflag = 0;
} }
outlen = ((inlen - 1) / 2) + 1; outlen = ((inlen - 1) / 2) + 1;
if (outlen * sizeof(wchar16_t) > sizeof(outtmp)) { if(outlen * sizeof(wchar16_t) > sizeof(outtmp)) {
woutstr = (wchar16_t *) malloc(outlen * sizeof(wchar16_t)); woutstr = (wchar16_t*)malloc(outlen * sizeof(wchar16_t));
if (!woutstr) { if(!woutstr) {
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
omflag = 1; omflag = 1;
} else { } else {
woutstr = (wchar16_t *) outtmp; woutstr = (wchar16_t*)outtmp;
} }
ret = sj3_zentohan_w16(woutstr, winstr); ret = sj3_zentohan_w16(woutstr, winstr);
if (ret == 0 || ret == -1) { if(ret == 0 || ret == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return ret; return ret;
} }
outlen = ret * 3; outlen = ret * 3;
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
if (outlen > sizeof(mtmp)) { if(outlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(outlen); mstr = (u_char*)malloc(outlen);
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
@ -629,146 +598,138 @@ sj3_zentohan(u_char *out, u_char *in)
} else { } else {
mstr = out; mstr = out;
} }
if (wcstombs((char *)mstr, woutstr, outlen) == -1) { if(wcstombs((char*)mstr, woutstr, outlen) == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return -1; return -1;
} }
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
if (euctosjis(out, outlen, mstr, outlen) < 0) { if(euctosjis(out, outlen, mstr, outlen) < 0) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
} }
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
return ret; return ret;
} }
int int sj3_zentohan_euc(u_char* out, u_char* in) {
sj3_zentohan_euc(u_char *out, u_char *in)
{
wchar16_t *winstr, *woutstr; wchar16_t *winstr, *woutstr;
u_char *mstr; u_char* mstr;
int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret; int inlen, outlen, imflag = 0, omflag = 0, mmflag = 0, ret;
inlen = strlen(in) + 1; inlen = strlen(in) + 1;
if (inlen > sizeof(mtmp)) { if(inlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(inlen); mstr = (u_char*)malloc(inlen);
if (!mstr) { if(!mstr) {
return -1; return -1;
} }
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
(void) euctosjis(mstr, inlen, in, inlen); (void)euctosjis(mstr, inlen, in, inlen);
} else { } else {
(void) memcpy(mstr, in, inlen); (void)memcpy(mstr, in, inlen);
} }
if (inlen > sizeof(intmp)) { if(inlen > sizeof(intmp)) {
winstr = (wchar16_t *) malloc(((inlen / 2) + 1) * sizeof(wchar16_t)); winstr = (wchar16_t*)malloc(((inlen / 2) + 1) * sizeof(wchar16_t));
if (!winstr) { if(!winstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
imflag = 1; imflag = 1;
} else { } else {
winstr = (wchar16_t *) intmp; winstr = (wchar16_t*)intmp;
} }
if (mbstowcs(winstr, (char *)mstr, inlen) == -1) { if(mbstowcs(winstr, (char*)mstr, inlen) == -1) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
if (mmflag) { if(mmflag) {
free(mstr); free(mstr);
mmflag = 0; mmflag = 0;
} }
outlen = ((inlen - 1) / 2) + 1; outlen = ((inlen - 1) / 2) + 1;
if (outlen * sizeof(wchar16_t) > sizeof(outtmp)) { if(outlen * sizeof(wchar16_t) > sizeof(outtmp)) {
woutstr = (wchar16_t *) malloc(outlen * sizeof(wchar16_t)); woutstr = (wchar16_t*)malloc(outlen * sizeof(wchar16_t));
if (!woutstr) { if(!woutstr) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
return -1; return -1;
} }
omflag = 1; omflag = 1;
} else { } else {
woutstr = (wchar16_t *) outtmp; woutstr = (wchar16_t*)outtmp;
} }
ret = sj3_zentohan_w16(woutstr, winstr); ret = sj3_zentohan_w16(woutstr, winstr);
if (ret == 0 || ret == -1) { if(ret == 0 || ret == -1) {
if (mmflag) free(mstr); if(mmflag) free(mstr);
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return ret; return ret;
} }
outlen = ret * 3; outlen = ret * 3;
if (current_locale == LC_CTYPE_EUC) { if(current_locale == LC_CTYPE_EUC) {
mstr = out; mstr = out;
} else { } else {
if (outlen > sizeof(mtmp)) { if(outlen > sizeof(mtmp)) {
mstr = (u_char *) malloc(outlen); mstr = (u_char*)malloc(outlen);
mmflag = 1; mmflag = 1;
} else { } else {
mstr = mtmp; mstr = mtmp;
} }
} }
if (wcstombs((char *)mstr, woutstr, outlen) == -1) { if(wcstombs((char*)mstr, woutstr, outlen) == -1) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
return -1; return -1;
} }
if (current_locale == LC_CTYPE_SHIFTJIS) { if(current_locale == LC_CTYPE_SHIFTJIS) {
if (sjistoeuc(out, outlen, mstr, outlen) < 0) { if(sjistoeuc(out, outlen, mstr, outlen) < 0) {
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
return -1; return -1;
} }
} }
if (imflag) free(winstr); if(imflag) free(winstr);
if (omflag) free(woutstr); if(omflag) free(woutstr);
if (mmflag) free(mstr); if(mmflag) free(mstr);
return ret; return ret;
} }
int int sj3_zentohan_mb(u_char* s1, u_char* s2) {
sj3_zentohan_mb(u_char *s1, u_char *s2) if(current_locale == LC_CTYPE_EUC)
{
if (current_locale == LC_CTYPE_EUC)
return sj3_zentohan_euc(s1, s2); return sj3_zentohan_euc(s1, s2);
else else
return sj3_zentohan(s1, s2); return sj3_zentohan(s1, s2);
} }
int int sj3_zentohan_w16(wchar16_t* s1, wchar16_t* s2) {
sj3_zentohan_w16(wchar16_t *s1, wchar16_t *s2)
{
return sj_zentohan(s1, s2, wslen(s2)); return sj_zentohan(s1, s2, wslen(s2));
} }
int int sj_zentohan(wchar16_t* s1, wchar16_t* s2, int len) {
sj_zentohan(wchar16_t *s1, wchar16_t *s2, int len)
{
u_short cc; u_short cc;
wchar16_t c; wchar16_t c;
int i, rlen; int i, rlen;
rlen = 0; rlen = 0;
for (i = 0; i < len && *s2 != (wchar16_t) '\0'; i++) { for(i = 0; i < len && *s2 != (wchar16_t)'\0'; i++) {
c = *s2++; c = *s2++;
if (WcIsZENKAKU(c)) { if(WcIsZENKAKU(c)) {
cc = sj_zen2han(c); cc = sj_zen2han(c);
if ((cc >> 8) && (cc != c)) { if((cc >> 8) && (cc != c)) {
*s1++ = (cc >> 8); *s1++ = (cc >> 8);
rlen++; rlen++;
*s1++ = cc & 0xff; *s1++ = cc & 0xff;
@ -778,63 +739,55 @@ sj_zentohan(wchar16_t *s1, wchar16_t *s2, int len)
} else } else
cc = c; cc = c;
if (cc & RKZEN) { if(cc & RKZEN) {
*s1++ = (cc >> 8); *s1++ = (cc >> 8);
rlen++; rlen++;
} }
*s1++ = (wchar16_t)cc; *s1++ = (wchar16_t)cc;
rlen++; rlen++;
} }
*s1 = (wchar16_t) '\0'; *s1 = (wchar16_t)'\0';
return(rlen); return (rlen);
} }
int int sj_tokata(wchar16_t c) {
sj_tokata(wchar16_t c) if(sj_ishira(c)) {
{
if (sj_ishira(c)) {
c += 0x0100; c += 0x0100;
} }
return(c); return (c);
} }
int int sj_tohira(wchar16_t c) {
sj_tohira(wchar16_t c) if(sj_iskata(c) && (short)c <= (short)0xa5f3) {
{
if (sj_iskata(c) && (short) c <= (short) 0xa5f3) {
c -= 0x0100; c -= 0x0100;
} }
return(c); return (c);
} }
int int sj_htok(wchar16_t* s1, wchar16_t* s2) {
sj_htok(wchar16_t *s1, wchar16_t *s2)
{
wchar16_t cc; wchar16_t cc;
wchar16_t c; wchar16_t c;
while ((c = *s2++) != (wchar16_t) '\0') { while((c = *s2++) != (wchar16_t)'\0') {
if (WcIsX0208(c)) { if(WcIsX0208(c)) {
cc = sj_tokata(c); cc = sj_tokata(c);
*s1++ = cc; *s1++ = cc;
} else } else
*s1++ = c; *s1++ = c;
} }
*s1 = (wchar16_t) '\0'; *s1 = (wchar16_t)'\0';
} }
int int sj_ktoh(wchar16_t* s1, wchar16_t* s2) {
sj_ktoh(wchar16_t *s1, wchar16_t *s2)
{
wchar16_t cc; wchar16_t cc;
wchar16_t c; wchar16_t c;
while ((c = *s2++) != (wchar16_t) '\0') { while((c = *s2++) != (wchar16_t)'\0') {
if (WcIsX0208(c)) { if(WcIsX0208(c)) {
cc = sj_tohira(c); cc = sj_tohira(c);
*s1++ = cc; *s1++ = cc;
} else } else
*s1++ = c; *s1++ = c;
} }
*s1 = (wchar16_t) '\0'; *s1 = (wchar16_t)'\0';
} }

225
lib/sj3rkcv/wc16_str.c
View file

@ -33,7 +33,6 @@
* $SonyDate: 1994/11/17 06:49:21 $ * $SonyDate: 1994/11/17 06:49:21 $
*/ */
#include <stdio.h> #include <stdio.h>
#include <locale.h> #include <locale.h>
#include "wchar16.h" #include "wchar16.h"
@ -57,98 +56,83 @@
extern int current_locale; extern int current_locale;
int int sj3_iswcntrl16(wchar16_t wc) {
sj3_iswcntrl16(wchar16_t wc) if((wc < 0x20) || (wc == 0x7f)) return TRUE;
{
if ((wc < 0x20) || (wc == 0x7f)) return TRUE;
return FALSE; return FALSE;
} }
int int sj3_iswupper16(wchar16_t wc) {
sj3_iswupper16(wchar16_t wc) if(((0x40 < wc) && (wc < 0x5b)) ||
{
if (((0x40 < wc) && (wc < 0x5b)) ||
((0xa3c0 < wc) && (wc < 0xa3db))) return TRUE; ((0xa3c0 < wc) && (wc < 0xa3db))) return TRUE;
return FALSE; return FALSE;
} }
int int sj3_iswdigit16(wchar16_t wc) {
sj3_iswdigit16(wchar16_t wc) if(((0x29 < wc) && (wc < 0x3a)) ||
{
if (((0x29 < wc) && (wc < 0x3a)) ||
((0xa3af < wc) && (wc < 0xa3ba))) return TRUE; ((0xa3af < wc) && (wc < 0xa3ba))) return TRUE;
return FALSE; return FALSE;
} }
int int sj3_iswxdigit16(wchar16_t wc) {
sj3_iswxdigit16(wchar16_t wc) if(((0x29 < wc) && (wc < 0x3a)) ||
{
if (((0x29 < wc) && (wc < 0x3a)) ||
((0xa3af < wc) && (wc < 0xa3ba))) return TRUE; ((0xa3af < wc) && (wc < 0xa3ba))) return TRUE;
if (((0x60 < wc) && (wc < 0x67)) || if(((0x60 < wc) && (wc < 0x67)) ||
((0x40 < wc) && (wc < 0x47))) return TRUE; ((0x40 < wc) && (wc < 0x47))) return TRUE;
if (((0xa3c0 < wc) && (wc < 0xa3c7)) || if(((0xa3c0 < wc) && (wc < 0xa3c7)) ||
((0xa3e0 < wc) && (wc < 0xa3e6))) return TRUE; ((0xa3e0 < wc) && (wc < 0xa3e6))) return TRUE;
return FALSE; return FALSE;
} }
int int sj3_wslen16(wchar16_t* ws) {
sj3_wslen16(wchar16_t *ws) int i = 0;
{
int i=0;
if (!ws) return 0; if(!ws) return 0;
while (*ws++) i++; while(*ws++) i++;
return i; return i;
} }
int int sj3_wscmp16(wchar16_t* ws1, wchar16_t* ws2) {
sj3_wscmp16(wchar16_t *ws1, wchar16_t *ws2) while((*ws1 && *ws2) && (*ws1 == *ws2)) {
{
while ((*ws1 && *ws2) && (*ws1 == *ws2)) {
ws1++; ws1++;
ws2++; ws2++;
} }
if (!*ws1 && !*ws2) return 0; if(!*ws1 && !*ws2) return 0;
if (!*ws1) return -1; if(!*ws1) return -1;
if (!*ws2) return 1; if(!*ws2) return 1;
if (*ws1 < *ws2) return -1; if(*ws1 < *ws2) return -1;
return 1; return 1;
} }
int int sj3_wsncmp16(wchar16_t* ws1, wchar16_t* ws2, int n) {
sj3_wsncmp16(wchar16_t *ws1, wchar16_t *ws2, int n) int i = 0;
{
int i=0;
while ((*ws1 && *ws2) && (*ws1 == *ws2) && (i < n)) { while((*ws1 && *ws2) && (*ws1 == *ws2) && (i < n)) {
ws1++; ws1++;
ws2++; ws2++;
i++; i++;
} }
if (!*ws1 && !*ws2) return 0; if(!*ws1 && !*ws2) return 0;
if (i == n) return 0; if(i == n) return 0;
if (!*ws1) return -1; if(!*ws1) return -1;
if (!*ws2) return 1; if(!*ws2) return 1;
if (*ws1 < *ws2) return -1; if(*ws1 < *ws2) return -1;
return 1; return 1;
} }
wchar16_t * wchar16_t*
sj3_wscpy16(wchar16_t *ws1, wchar16_t *ws2) sj3_wscpy16(wchar16_t* ws1, wchar16_t* ws2) {
{ wchar16_t* ws;
wchar16_t *ws;
if (!ws2) return NULL; if(!ws2) return NULL;
ws = ws1; ws = ws1;
while (*ws2) { while(*ws2) {
*ws++ = *ws2++; *ws++ = *ws2++;
} }
*ws = 0; *ws = 0;
@ -156,35 +140,33 @@ sj3_wscpy16(wchar16_t *ws1, wchar16_t *ws2)
return ws1; return ws1;
} }
wchar16_t * wchar16_t*
sj3_wsncpy16(wchar16_t *ws1, wchar16_t *ws2, int n) sj3_wsncpy16(wchar16_t* ws1, wchar16_t* ws2, int n) {
{ wchar16_t* ws;
wchar16_t *ws; int i = 0;
int i=0;
if (!ws2) return NULL; if(!ws2) return NULL;
ws = ws1; ws = ws1;
while (*ws2 && (i < n)) { while(*ws2 && (i < n)) {
*ws++ = *ws2++; *ws++ = *ws2++;
i++; i++;
} }
if (i < n) *ws = 0; if(i < n) *ws = 0;
return ws1; return ws1;
} }
wchar16_t * wchar16_t*
sj3_wscat16(wchar16_t *ws1, wchar16_t *ws2) sj3_wscat16(wchar16_t* ws1, wchar16_t* ws2) {
{ wchar16_t* ws;
wchar16_t *ws;
if (!ws1) return NULL; if(!ws1) return NULL;
if (!ws2) return NULL; if(!ws2) return NULL;
ws = ws1; ws = ws1;
while (*ws) ws++; while(*ws) ws++;
while (*ws2) { while(*ws2) {
*ws++ = *ws2++; *ws++ = *ws2++;
} }
*ws = 0; *ws = 0;
@ -192,15 +174,13 @@ sj3_wscat16(wchar16_t *ws1, wchar16_t *ws2)
return ws1; return ws1;
} }
wchar16_t wchar16_t
sj3_euc2wc16(unsigned int code) sj3_euc2wc16(unsigned int code) {
{
wchar16_t wc = 0; wchar16_t wc = 0;
if (((code >> 16) & 0xff) == SS3) { if(((code >> 16) & 0xff) == SS3) {
wc = code & 0xff7f; wc = code & 0xff7f;
} else if (((code >> 8) & 0xff) == SS2) { } else if(((code >> 8) & 0xff) == SS2) {
wc = code & 0xff; wc = code & 0xff;
} else { } else {
wc = code; wc = code;
@ -210,13 +190,12 @@ sj3_euc2wc16(unsigned int code)
} }
wchar16_t wchar16_t
sj3_sjis2wc16(unsigned int code) sj3_sjis2wc16(unsigned int code) {
{
unsigned short ch; unsigned short ch;
if ((code >> 8) & 0xff) { if((code >> 8) & 0xff) {
ch = sjis2euc(code); ch = sjis2euc(code);
} else if (code & MSB) { } else if(code & MSB) {
ch = (SS2 << 8) + (code & 0xff); ch = (SS2 << 8) + (code & 0xff);
} else { } else {
return code; return code;
@ -225,20 +204,19 @@ sj3_sjis2wc16(unsigned int code)
} }
unsigned int unsigned int
sj3_wc2euc16(wchar16_t wc) sj3_wc2euc16(wchar16_t wc) {
{
unsigned int code = 0; unsigned int code = 0;
unsigned char tmp; unsigned char tmp;
tmp = (wc >> 8) & 0xff; tmp = (wc >> 8) & 0xff;
if (tmp) { if(tmp) {
if (wc & MSB) { if(wc & MSB) {
code = wc; code = wc;
} else { } else {
code = (SS3 << 16) + wc + MSB; code = (SS3 << 16) + wc + MSB;
} }
} else { } else {
if (wc & MSB) { if(wc & MSB) {
code = (SS2 << 8) + wc; code = (SS2 << 8) + wc;
} else { } else {
code = wc; code = wc;
@ -249,49 +227,46 @@ sj3_wc2euc16(wchar16_t wc)
} }
unsigned int unsigned int
sj3_wc2sjis16(wchar16_t wc) sj3_wc2sjis16(wchar16_t wc) {
{
unsigned int ch; unsigned int ch;
ch = sj3_wc2euc16(wc); ch = sj3_wc2euc16(wc);
if ((ch >> 16) == SS3) { if((ch >> 16) == SS3) {
return 0; return 0;
} else if ((ch >> 8) == SS2) { } else if((ch >> 8) == SS2) {
return (ch & 0xff); return (ch & 0xff);
} else if ((ch >> 8) & 0xff) { } else if((ch >> 8) & 0xff) {
return euc2sjis(ch); return euc2sjis(ch);
} else { } else {
return wc; return wc;
} }
} }
int int sj3_wcs2eucs16(unsigned char* mb, wchar16_t* ws, int n) {
sj3_wcs2eucs16(unsigned char *mb, wchar16_t *ws, int n)
{
int i = 0; int i = 0;
unsigned int code; unsigned int code;
unsigned char c; unsigned char c;
while (*ws && (i < n)) { while(*ws && (i < n)) {
code = sj3_wc2euc16(*ws); code = sj3_wc2euc16(*ws);
if (c = ((code >> 16) & 0xff)) { if(c = ((code >> 16) & 0xff)) {
*mb++ = c; *mb++ = c;
i++; i++;
if (i == n) break; if(i == n) break;
*mb++ = ((code >> 8) & 0xff); *mb++ = ((code >> 8) & 0xff);
i++; i++;
if (i == n) break; if(i == n) break;
*mb++ = code & 0xff; *mb++ = code & 0xff;
i++; i++;
if (i == n) break; if(i == n) break;
} else if (c = ((code >> 8) & 0xff)) { } else if(c = ((code >> 8) & 0xff)) {
*mb++ = c; *mb++ = c;
i++; i++;
if (i == n) break; if(i == n) break;
*mb++ = code & 0xff; *mb++ = code & 0xff;
i++; i++;
if (i == n) break; if(i == n) break;
} else if (c = (code & 0xff)) { } else if(c = (code & 0xff)) {
*mb++ = c; *mb++ = c;
i++; i++;
} else { } else {
@ -300,30 +275,28 @@ sj3_wcs2eucs16(unsigned char *mb, wchar16_t *ws, int n)
ws++; ws++;
} }
if (!*ws) { if(!*ws) {
*mb = '\0'; *mb = '\0';
} }
return i; return i;
} }
int int sj3_wcs2sjiss16(unsigned char* mb, wchar16_t* ws, int n) {
sj3_wcs2sjiss16(unsigned char *mb, wchar16_t *ws, int n)
{
int i = 0; int i = 0;
unsigned int code; unsigned int code;
unsigned char c; unsigned char c;
while (*ws && (i < n)) { while(*ws && (i < n)) {
code = sj3_wc2sjis16(*ws); code = sj3_wc2sjis16(*ws);
if (c = ((code >> 8) & 0xff)) { if(c = ((code >> 8) & 0xff)) {
*mb++ = c; *mb++ = c;
i++; i++;
if (i == n) break; if(i == n) break;
*mb++ = code & 0xff; *mb++ = code & 0xff;
i++; i++;
if (i == n) break; if(i == n) break;
} else if (c = (code & 0xff)) { } else if(c = (code & 0xff)) {
*mb++ = c; *mb++ = c;
i++; i++;
} else { } else {
@ -332,83 +305,73 @@ sj3_wcs2sjiss16(unsigned char *mb, wchar16_t *ws, int n)
ws++; ws++;
} }
if (!*ws) { if(!*ws) {
*mb = '\0'; *mb = '\0';
} }
return i; return i;
} }
int int sj3_eucs2wcs16(wchar16_t* ws, unsigned char* mb, int n) {
sj3_eucs2wcs16(wchar16_t *ws, unsigned char *mb, int n)
{
int i = 0; int i = 0;
unsigned int code; unsigned int code;
while (*mb && (i < n)) { while(*mb && (i < n)) {
if (*mb == SS3) { if(*mb == SS3) {
code = *mb++ << 16; code = *mb++ << 16;
code += *mb++ << 8; code += *mb++ << 8;
code += *mb++; code += *mb++;
} else if ((*mb == SS2) || (*mb & 0x80)) { } else if((*mb == SS2) || (*mb & 0x80)) {
code = *mb++ << 8; code = *mb++ << 8;
code += *mb++; code += *mb++;
} else { } else {
code = *mb++; code = *mb++;
} }
*ws = sj3_euc2wc16(code); *ws = sj3_euc2wc16(code);
if (!*ws) return -1; if(!*ws) return -1;
ws++; ws++;
i++; i++;
} }
if (!*mb) { if(!*mb) {
*ws = 0; *ws = 0;
} }
return i; return i;
} }
int int sj3_sjiss2wcs16(wchar16_t* ws, unsigned char* mb, int n) {
sj3_sjiss2wcs16(wchar16_t *ws, unsigned char *mb, int n)
{
int i = 0; int i = 0;
unsigned int code; unsigned int code;
while (*mb && (i < n)) { while(*mb && (i < n)) {
if (issjis1(*mb)) { if(issjis1(*mb)) {
code = *mb++ << 8; code = *mb++ << 8;
code += *mb++; code += *mb++;
} else { } else {
code = *mb++; code = *mb++;
} }
*ws = sj3_sjis2wc16(code); *ws = sj3_sjis2wc16(code);
if (!*ws) return -1; if(!*ws) return -1;
ws++; ws++;
i++; i++;
} }
if (!*mb) { if(!*mb) {
*ws = 0; *ws = 0;
} }
return i; return i;
} }
int int sj3_mbstowcs16(wchar16_t* ws, unsigned char* mb, int n) {
sj3_mbstowcs16(wchar16_t *ws, unsigned char *mb, int n) if(current_locale == LC_CTYPE_EUC)
{
if (current_locale == LC_CTYPE_EUC)
return sj3_eucs2wcs16(ws, mb, n); return sj3_eucs2wcs16(ws, mb, n);
else else
return sj3_sjiss2wcs16(ws, mb, n); return sj3_sjiss2wcs16(ws, mb, n);
} }
int int sj3_wcstombs16(unsigned char* mb, unsigned char* ws, int n) {
sj3_wcstombs16(unsigned char *mb, unsigned char *ws, int n) if(current_locale == LC_CTYPE_EUC)
{
if (current_locale == LC_CTYPE_EUC)
return sj3_wcs2eucs16(mb, ws, n); return sj3_wcs2eucs16(mb, ws, n);
else else
return sj3_wcs2sjiss16(mb, ws, n); return sj3_wcs2sjiss16(mb, ws, n);
} }

225
src/sj3mkdic/char.c
View file

@ -33,15 +33,12 @@
* $SonyDate: 1994/06/03 08:00:32 $ * $SonyDate: 1994/06/03 08:00:32 $
*/ */
#include "sj_euc.h" #include "sj_euc.h"
#include "sj3_dict_const.h" #include "sj3_dict_const.h"
#include "sj3mkdic.h" #include "sj3mkdic.h"
int int cnvyomi(int code) {
cnvyomi(int code)
{
u_short hh; u_short hh;
u_char high; u_char high;
u_char low; u_char low;
@ -50,44 +47,47 @@ cnvyomi(int code)
high = ((code >> 8) & 0xff); high = ((code >> 8) & 0xff);
low = (code & 0xff); low = (code & 0xff);
if (!hh) { if(!hh) {
if (high == 0xa1) { if(high == 0xa1) {
switch (low) { switch(low) {
case 0xbc: return 1; case 0xbc:
case 0xf4: return 2; return 1;
case 0xf7: return 3; case 0xf4:
case 0xa7: return 4; return 2;
} case 0xf7:
} return 3;
else if (high == 0xa2) { case 0xa7:
if (low == 0xa9)
return 4; return 4;
} }
else if (high == 0xa3) { } else if(high == 0xa2) {
if (low < 0xb0) if(low == 0xa9)
return 4;
} else if(high == 0xa3) {
if(low < 0xb0)
; ;
else if (low <= 0xb9) else if(low <= 0xb9)
return(low - 0xb0 + 0x10); return (low - 0xb0 + 0x10);
else if (low < 0xc0) else if(low < 0xc0)
; ;
else if (low <= 0xda) else if(low <= 0xda)
return(low - 0xc1 + 0x1A); return (low - 0xc1 + 0x1A);
else if (low < 0xe1) else if(low < 0xe1)
; ;
else if (low <= 0xfa) else if(low <= 0xfa)
return(low - 0xe1 + 0x34); return (low - 0xe1 + 0x34);
} } else if(high == 0xa4) {
else if (high == 0xa4) { if(low < 0xa1)
if (low < 0xa1)
; ;
else if (low <= 0xf3) else if(low <= 0xf3)
return(low - 0xa1 + 0x4e); return (low - 0xa1 + 0x4e);
} } else if(high == 0xa5) {
else if (high == 0xa5) { switch(low) {
switch (low) { case 0xf4:
case 0xf4: return 0xa1; return 0xa1;
case 0xf5: return 0xa2; case 0xf5:
case 0xf6: return 0xa3; return 0xa2;
case 0xf6:
return 0xa3;
} }
} }
} }
@ -95,10 +95,7 @@ cnvyomi(int code)
return 0; return 0;
} }
int h2kcode(int code) {
int
h2kcode(int code)
{
u_short hh; u_short hh;
u_char high; u_char high;
u_char low; u_char low;
@ -107,8 +104,8 @@ h2kcode(int code)
high = ((code >> 8) & 0xff); high = ((code >> 8) & 0xff);
low = (code & 0xff); low = (code & 0xff);
if (!hh) { if(!hh) {
if (high != 0xa4) if(high != 0xa4)
return code; return code;
else else
return (code + 0x0100); return (code + 0x0100);
@ -116,11 +113,8 @@ h2kcode(int code)
return code; /* XXX */ return code; /* XXX */
} }
int codesize(u_char code) {
int switch(code & KANJIMODEMASK) {
codesize(u_char code)
{
switch (code & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
case ZENKATAASSYUKU: case ZENKATAASSYUKU:
case KANJIASSYUKU: case KANJIASSYUKU:
@ -135,12 +129,9 @@ codesize(u_char code)
} }
} }
void output_knj(FILE* fp, u_char* p, int l) {
void while(l > 0) {
output_knj(FILE *fp, u_char *p, int l) switch(*p & KANJIMODEMASK) {
{
while (l > 0) {
switch (*p & KANJIMODEMASK) {
case ZENHIRAASSYUKU: case ZENHIRAASSYUKU:
fprintf(fp, "\244\322%d", (*p++ & 0x0f) + 1); fprintf(fp, "\244\322%d", (*p++ & 0x0f) + 1);
l--; l--;
@ -158,114 +149,118 @@ output_knj(FILE *fp, u_char *p, int l)
l = 0; l = 0;
fprintf(stderr, "\244\252\244\253\244\267\244\244"); fprintf(stderr, "\244\252\244\253\244\267\244\244");
#else #else
fputc(*p++, fp); l--; fputc(*p++, fp);
fputc(*p++, fp); l--; l--;
fputc(*p++, fp);
l--;
#endif #endif
break; break;
case OFFSETASSYUKU: case OFFSETASSYUKU:
fprintf(fp, "ofs%1x", (*p++ & 0x0f)); fprintf(fp, "ofs%1x", (*p++ & 0x0f));
l--; l--;
fprintf(fp, "%02x", *p++); l--; fprintf(fp, "%02x", *p++);
l--;
break; break;
case AIATTRIBUTE: case AIATTRIBUTE:
fprintf(fp, "\302\260%1x", (*p++ & 0x0f)); fprintf(fp, "\302\260%1x", (*p++ & 0x0f));
l--; l--;
fprintf(fp, "%02x", *p++); l--; fprintf(fp, "%02x", *p++);
l--;
break; break;
case KANJISTREND: case KANJISTREND:
p++; l--; p++;
l--;
break; break;
default: default:
if (p[1] & 0x80) if(p[1] & 0x80)
fputc(SS3, fp); fputc(SS3, fp);
fputc((*p | 0x80), fp); l--; p++; fputc((*p | 0x80), fp);
fputc((*p | 0x80), fp); l--; p++; l--;
p++;
fputc((*p | 0x80), fp);
l--;
p++;
} }
} }
} }
void output_str(FILE* fp, char* p) {
void while(*p) {
output_str(FILE *fp, char *p) fputc(*p, fp);
{ p++;
while (*p) { fputc(*p, fp); p++; } }
} }
void output_int(FILE* fp, int* p) {
while(*p) {
void if(*p < 0x100) {
output_int(FILE *fp, int *p) fputc(*p, fp);
{ p++;
while (*p) { } else if(*p < 0x10000) {
if (*p < 0x100) {
fputc(*p, fp); p++;
}
else if (*p < 0x10000) {
fputc((*p >> 8) & 0xff, fp); fputc((*p >> 8) & 0xff, fp);
fputc(*p & 0xff, fp); p++; fputc(*p & 0xff, fp);
} p++;
else if (*p < 0x1000000) { } else if(*p < 0x1000000) {
fputc((*p >> 16) & 0xff, fp); fputc((*p >> 16) & 0xff, fp);
fputc((*p >> 8) & 0xff, fp); fputc((*p >> 8) & 0xff, fp);
fputc(*p & 0xff, fp); p++; fputc(*p & 0xff, fp);
} p++;
else { } else {
fputc((*p >> 24) & 0xff, fp); fputc((*p >> 24) & 0xff, fp);
fputc((*p >> 16) & 0xff, fp); fputc((*p >> 16) & 0xff, fp);
fputc((*p >> 8) & 0xff, fp); fputc((*p >> 8) & 0xff, fp);
fputc(*p & 0xff, fp); p++; fputc(*p & 0xff, fp);
p++;
} }
} }
} }
int yomi2zen(int code) {
int
yomi2zen(int code)
{
static char num[] = { static char num[] = {
'0', '1', '2', '3', '4', '5', '6', '7', '0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F' '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
};
switch (code) { switch(code) {
case 0x01: return 0xa1bc; case 0x01:
case 0x02: return 0xa1f4; return 0xa1bc;
case 0x03: return 0xa1f7; case 0x02:
case 0x04: return 0xa2a9; return 0xa1f4;
case 0xa1: return 0xa5f4; case 0x03:
case 0xa2: return 0xa5f5; return 0xa1f7;
case 0xa3: return 0xa5f6; case 0x04:
default: break; return 0xa2a9;
case 0xa1:
return 0xa5f4;
case 0xa2:
return 0xa5f5;
case 0xa3:
return 0xa5f6;
default:
break;
} }
if (code < 0x10) if(code < 0x10)
; ;
else if (code < 0x1a) else if(code < 0x1a)
return(0xa300 + code - 0x10 + 0xb0); return (0xa300 + code - 0x10 + 0xb0);
else if (code < 0x34) else if(code < 0x34)
return(0xa300 + code - 0x1a + 0xc1); return (0xa300 + code - 0x1a + 0xc1);
else if (code < 0x4e) else if(code < 0x4e)
return(0xa300 + code - 0x34 + 0xe1); return (0xa300 + code - 0x34 + 0xe1);
else if (code < 0xa1) else if(code < 0xa1)
return(0xa400 + code - 0x4e + 0xa1); return (0xa400 + code - 0x4e + 0xa1);
return ((num[(code >> 4) & 0x0f] << 8) | num[code & 0x0f]); return ((num[(code >> 4) & 0x0f] << 8) | num[code & 0x0f]);
} }
void output_yomi(FILE* fp, u_char* p) {
void
output_yomi(FILE *fp, u_char *p)
{
int i; int i;
while (*p) { while(*p) {
i = yomi2zen(*p++); i = yomi2zen(*p++);
fputc((i >> 8) & 0xff, fp); fputc((i >> 8) & 0xff, fp);
fputc(i & 0xff, fp); fputc(i & 0xff, fp);

49
src/sj3mkdic/cnvhinsi.c
View file

@ -33,42 +33,34 @@
* $SonyDate: 1996/05/27 06:59:47 $ * $SonyDate: 1996/05/27 06:59:47 $
*/ */
#include "sj3mkdic.h" #include "sj3mkdic.h"
static struct gram_code { static struct gram_code {
char *name; char* name;
int code; int code;
} gramtbl[] = { } gramtbl[] = {
#include "GramTable" #include "GramTable"
}; };
#define GramMax (sizeof(gramtbl)/sizeof(struct gram_code) - 1) #define GramMax (sizeof(gramtbl) / sizeof(struct gram_code) - 1)
int int u_strcmp(u_char* a, u_char* b) {
u_strcmp(u_char *a, u_char *b) if(!a || !b) return 0;
{
if (!a || !b) return 0;
while (*a && *b) { while(*a && *b) {
if (*a < *b) return -1; if(*a < *b) return -1;
if (*a > *b) return 1; if(*a > *b) return 1;
a++; a++;
b++; b++;
} }
if (!*a && !*b) return 0; if(!*a && !*b) return 0;
if (!*a) return -1; if(!*a) return -1;
return 1; return 1;
} }
int cnvhinsi(u_char* buf) {
int
cnvhinsi(u_char *buf)
{
int min; int min;
int max; int max;
int mid; int mid;
@ -76,40 +68,33 @@ cnvhinsi(u_char *buf)
min = 0; min = 0;
max = GramMax; max = GramMax;
while (min <= max) { while(min <= max) {
mid = (min + max) / 2; mid = (min + max) / 2;
i = u_strcmp(buf, gramtbl[mid].name); i = u_strcmp(buf, gramtbl[mid].name);
if(i < 0) {
if (i < 0) {
max = mid - 1; max = mid - 1;
} }
else if (i > 0) { else if(i > 0) {
min = mid + 1; min = mid + 1;
} }
else { else {
return(gramtbl[mid].code); return (gramtbl[mid].code);
} }
} }
return 0; return 0;
} }
char* hinsi_str(int code) {
char *
hinsi_str(int code)
{
int i; int i;
for (i = 0 ; i <= GramMax ; i++) { for(i = 0; i <= GramMax; i++) {
if (gramtbl[i].code == code) return gramtbl[i].name; if(gramtbl[i].code == code) return gramtbl[i].name;
} }
return "Err"; return "Err";

93
src/sj3mkdic/file.c
View file

@ -36,121 +36,104 @@
#include "sj3mkdic.h" #include "sj3mkdic.h"
typedef struct filelist { typedef struct filelist {
FILE *fp; FILE* fp;
char *fname; char* fname;
struct filelist *next; struct filelist* next;
} FileList; } FileList;
static FileList *flist = NULL; static FileList* flist = NULL;
static char * static char*
get_fname(FILE *fp) get_fname(FILE* fp) {
{ FileList* p;
FileList *p;
for (p = flist ; p ; p = p -> next) for(p = flist; p; p = p->next)
if (p -> fp == fp) return p -> fname; if(p->fp == fp) return p->fname;
return "some file"; return "some file";
} }
FILE * FILE* Fopen(char* filename, char* type) {
Fopen(char *filename, char *type) FILE* fp;
{ char* p;
FILE *fp; FileList* fl;
char *p;
FileList *fl;
size_t len; size_t len;
if (!(fp = fopen(filename, type))) { if(!(fp = fopen(filename, type))) {
fprintf(stderr, "Can't open %s mode \"%s\"\n", filename, type); fprintf(stderr, "Can't open %s mode \"%s\"\n", filename, type);
exit(1); exit(1);
} }
fl = (FileList *)Malloc(sizeof(*fl)); fl = (FileList*)Malloc(sizeof(*fl));
len = strlen(filename) + 1; len = strlen(filename) + 1;
fl -> fname = Malloc(len); fl->fname = Malloc(len);
strlcpy(fl -> fname, filename, len); strlcpy(fl->fname, filename, len);
fl -> fp = fp; fl->fp = fp;
fl -> next = flist; fl->next = flist;
return fp; return fp;
} }
void void Fclose(FILE* fp) {
Fclose(FILE *fp)
{
FileList *p, *q; FileList *p, *q;
if (fclose(fp) == EOF) { if(fclose(fp) == EOF) {
fprintf(stderr, "Close error in %s\n", get_fname(fp)); fprintf(stderr, "Close error in %s\n", get_fname(fp));
exit(1); exit(1);
} }
for (p = flist, q = NULL ; p ; q = p, p = p -> next) { for(p = flist, q = NULL; p; q = p, p = p->next) {
if (p -> fp == fp) { if(p->fp == fp) {
if (q) if(q)
q -> next = p -> next; q->next = p->next;
else else
flist = p -> next; flist = p->next;
free(p -> fname); free(p->fname);
free(p); free(p);
break; break;
} }
} }
} }
int int Fseek(FILE* fp, long ofs, int ptr) {
Fseek(FILE *fp, long ofs, int ptr) if(fseek(fp, ofs, ptr) == 0) return 0;
{
if (fseek(fp, ofs, ptr) == 0) return 0;
fprintf(stderr, "Seek error in %s\n", get_fname(fp)); fprintf(stderr, "Seek error in %s\n", get_fname(fp));
exit(1); exit(1);
} }
long long Ftell(FILE* fp) {
Ftell(FILE *fp)
{
return ftell(fp); return ftell(fp);
} }
long long Fsize(char* filename) {
Fsize(char *filename)
{
struct stat buf; struct stat buf;
if (stat(filename, &buf) == 0) return (long)buf.st_size; if(stat(filename, &buf) == 0) return (long)buf.st_size;
fprintf(stderr, "Stat error in %s\n", filename); fprintf(stderr, "Stat error in %s\n", filename);
exit(1); exit(1);
} }
size_t size_t
Fread(char *p, int s, int n, FILE *fp) Fread(char* p, int s, int n, FILE* fp) {
{ if(fread(p, s, n, fp) == n) return n;
if (fread(p, s, n, fp) == n) return n;
fprintf(stderr, "Read error in %s\n", get_fname(fp)); fprintf(stderr, "Read error in %s\n", get_fname(fp));
exit(1); exit(1);
} }
size_t size_t
Fwrite(char *p, int s, int n, FILE *fp) Fwrite(char* p, int s, int n, FILE* fp) {
{ if(fwrite(p, s, n, fp) == n) return n;
if (fwrite(p, s, n, fp) == n) return n;
fprintf(stderr, "Write error in %s\n", get_fname(fp)); fprintf(stderr, "Write error in %s\n", get_fname(fp));
exit(1); exit(1);
} }
int int Fgetc(FILE* fp) {
Fgetc(FILE *fp)
{
return fgetc(fp); return fgetc(fp);
} }
int int Fflush(FILE* fp) {
Fflush(FILE *fp)
{
return fflush(fp); return fflush(fp);
} }

Some files were not shown because too many files have changed in this diff Show more