mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 06:03:02 +01:00
Remove JPN_ defines
This commit is contained in:
brodsom
parent
ceaa48f43d
commit
175ebf3fd0
@ -27,7 +27,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: c_cxx.cpp,v 1.13 2002-12-16 15:51:37 alexpeshkoff Exp $
|
||||
// $Id: c_cxx.cpp,v 1.14 2003-02-08 00:36:52 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
@ -52,11 +52,6 @@ extern "C" {
|
||||
|
||||
extern TEXT *transaction_name;
|
||||
|
||||
#if (defined JPN_EUC || defined JPN_SJIS)
|
||||
extern SCHAR default_dpb[];
|
||||
extern USHORT default_dpb_size;
|
||||
#endif
|
||||
|
||||
static void align(int);
|
||||
static void asgn_from(ACT, REF, int);
|
||||
static void asgn_sqlda_from(REF, int, SCHAR *, int);
|
||||
@ -674,7 +669,6 @@ static void asgn_from( ACT action, REF reference, int column)
|
||||
if (!slice_flag &&
|
||||
reference->ref_value &&
|
||||
(reference->ref_flags & REF_array_elem)) field = field->fld_array;
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
if (field && field->fld_dtype <= dtype_cstring)
|
||||
if (field->fld_sub_type == 1)
|
||||
if (field->fld_length == 1)
|
||||
@ -695,34 +689,6 @@ static void asgn_from( ACT action, REF reference, int column)
|
||||
else
|
||||
ib_fprintf(out_file, "isc_vtof (%s, %s, %d);", value,
|
||||
variable, field->fld_length);
|
||||
#else
|
||||
/* To avoid chopping off a double byte kanji character in between
|
||||
the two bytes, generate calls to isc_ftof2 isc_vtof2 and
|
||||
isc_vtov2 wherever necessary */
|
||||
|
||||
if (field && field->fld_dtype <= dtype_cstring)
|
||||
if (field->fld_sub_type == 1)
|
||||
if (field->fld_length == 1)
|
||||
ib_fprintf(out_file, "%s = %s;", variable, value);
|
||||
else
|
||||
ib_fprintf(out_file,
|
||||
"isc_ftof (%s, sizeof (%s), %s, %d);", value,
|
||||
value, variable, field->fld_length);
|
||||
else if (field->fld_flags & FLD_dbkey)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, %d);", value,
|
||||
field->fld_length, variable, field->fld_length);
|
||||
else if (sw_cstring)
|
||||
ib_fprintf(out_file, "isc_vtov2 (%s, %s, %d, %d);", value,
|
||||
variable, field->fld_length, sw_interp);
|
||||
else if (reference->ref_source)
|
||||
ib_fprintf(out_file,
|
||||
"isc_ftof2 (%s, sizeof (%s), %s, %d, %d);", value,
|
||||
value, variable, field->fld_length, sw_interp);
|
||||
else
|
||||
ib_fprintf(out_file, "isc_vtof2 (%s, %s, %d, %d);", value,
|
||||
variable, field->fld_length, sw_interp);
|
||||
|
||||
#endif
|
||||
else if (!reference->ref_master
|
||||
|| (reference->ref_flags & REF_literal)) ib_fprintf(out_file,
|
||||
"%s = %s;",
|
||||
@ -809,7 +775,6 @@ static void asgn_to( ACT action, REF reference, int column)
|
||||
ib_fprintf(out_file, "%s = %s;", reference->ref_value, s);
|
||||
else if (field->fld_sub_type == 1 && field->fld_length == 1)
|
||||
ib_fprintf(out_file, "%s = %s;", reference->ref_value, s);
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
else if (field->fld_flags & FLD_dbkey)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, %d);",
|
||||
s, field->fld_length, reference->ref_value,
|
||||
@ -821,23 +786,6 @@ static void asgn_to( ACT action, REF reference, int column)
|
||||
else
|
||||
ib_fprintf(out_file, "isc_vtov ((char*)%s, (char*)%s, sizeof (%s));", s,
|
||||
reference->ref_value, reference->ref_value);
|
||||
#else
|
||||
/* To avoid chopping off a double byte kanji character in between
|
||||
the two bytes, generate calls to isc_ftof2 isc_vtof2 and
|
||||
isc_vtov2 wherever necessary */
|
||||
|
||||
else if (field->fld_flags & FLD_dbkey)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, %d);",
|
||||
s, field->fld_length, reference->ref_value,
|
||||
field->fld_length);
|
||||
else if (!sw_cstring || field->fld_sub_type == 1)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, sizeof (%s));", s,
|
||||
field->fld_length, reference->ref_value,
|
||||
reference->ref_value);
|
||||
else
|
||||
ib_fprintf(out_file, "isc_vtov2 (%s, %s, sizeof (%s), %d);", s,
|
||||
reference->ref_value, reference->ref_value, sw_interp);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Pick up NULL value if one is there
|
||||
@ -872,7 +820,6 @@ static void asgn_to_proc( REF reference, int column)
|
||||
ib_fprintf(out_file, "%s = %s;", reference->ref_value, s);
|
||||
else if (field->fld_sub_type == 1 && field->fld_length == 1)
|
||||
ib_fprintf(out_file, "%s = %s;", reference->ref_value, s);
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
else if (field->fld_flags & FLD_dbkey)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, %d);",
|
||||
s, field->fld_length, reference->ref_value,
|
||||
@ -884,24 +831,6 @@ static void asgn_to_proc( REF reference, int column)
|
||||
else
|
||||
ib_fprintf(out_file, "isc_vtov ((char*)%s, (char*)%s, sizeof (%s));", s,
|
||||
reference->ref_value, reference->ref_value);
|
||||
#else
|
||||
/* To avoid chopping off a double byte kanji character in between
|
||||
the two bytes, generate calls to isc_ftof2 isc_vtof2 and
|
||||
isc_vtov2 wherever necessary */
|
||||
|
||||
else if (field->fld_flags & FLD_dbkey)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, %d);",
|
||||
s, field->fld_length, reference->ref_value,
|
||||
field->fld_length);
|
||||
else if (!sw_cstring || field->fld_sub_type == 1)
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, sizeof (%s));", s,
|
||||
field->fld_length, reference->ref_value,
|
||||
reference->ref_value);
|
||||
else
|
||||
ib_fprintf(out_file, "isc_vtov2 (%s, %s, sizeof (%s), %d);", s,
|
||||
reference->ref_value, reference->ref_value, sw_interp);
|
||||
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -1646,21 +1575,6 @@ static void gen_database( ACT action, int column)
|
||||
printa(column, "isc_array_length, \t/* array return size */");
|
||||
printa(column, "SQLCODE;\t\t/* SQL status code */");
|
||||
|
||||
#if (defined JPN_EUC || defined JPN_SJIS)
|
||||
// Generate the default dpb to pass the users interpretation
|
||||
|
||||
ib_fprintf(out_file, "\n");
|
||||
printa(column - INDENT, "static short");
|
||||
printa(column, "isc_dpb_size = %d;", default_dpb_size);
|
||||
printa(column - INDENT, "static char");
|
||||
printa(column, "isc_dpb [] = {");
|
||||
column += INDENT;
|
||||
PRETTY_print_cdb(default_dpb, gen_blr, 0, 0);
|
||||
column -= INDENT;
|
||||
printa(column, "}; \t\t\t/* default dpb */");
|
||||
ib_fprintf(out_file, "\n");
|
||||
#endif
|
||||
|
||||
if (sw_pyxis)
|
||||
{
|
||||
if (sw_window_scope == DBB_STATIC)
|
||||
@ -2135,26 +2049,12 @@ static void gen_emodify( ACT action, int column)
|
||||
if (field->fld_dtype > dtype_cstring ||
|
||||
(field->fld_sub_type == 1 && field->fld_length == 1))
|
||||
ib_fprintf(out_file, "%s = %s;", s2, s1);
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
else if (sw_cstring && !field->fld_sub_type)
|
||||
ib_fprintf(out_file, "isc_vtov ((char*)%s, (char*)%s, %d);",
|
||||
s1, s2, field->fld_length);
|
||||
else
|
||||
ib_fprintf(out_file, "isc_ftof (%s, %d, %s, %d);",
|
||||
s1, field->fld_length, s2, field->fld_length);
|
||||
#else
|
||||
/* To avoid chopping off a double byte kanji character in between
|
||||
the two bytes, generate calls to isc_ftof2 iscvtof2 and
|
||||
iscvtov2 wherever necessary */
|
||||
|
||||
else if (sw_cstring && !field->fld_sub_type)
|
||||
ib_fprintf(out_file, "isc_vtov2 (%s, %s, %d, %d);",
|
||||
s1, s2, field->fld_length, sw_interp);
|
||||
else
|
||||
ib_fprintf(out_file, "isc_ftof2 (%s, %d, %s, %d, %d);",
|
||||
s1, field->fld_length, s2, field->fld_length,
|
||||
sw_interp);
|
||||
#endif
|
||||
if (field->fld_array_info)
|
||||
gen_get_or_put_slice(action, reference, FALSE, column);
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
//
|
||||
// All Rights Reserved.
|
||||
// Contributor(s): ______________________________________.
|
||||
// $Id: gpre.cpp,v 1.17 2002-12-06 13:43:10 eku Exp $
|
||||
// $Id: gpre.cpp,v 1.18 2003-02-08 00:36:51 brodsom Exp $
|
||||
// Revision 1.2 2000/11/16 15:54:29 fsg
|
||||
// Added new switch -verbose to gpre that will dump
|
||||
// parsed lines to stderr
|
||||
@ -42,7 +42,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: gpre.cpp,v 1.17 2002-12-06 13:43:10 eku Exp $
|
||||
// $Id: gpre.cpp,v 1.18 2003-02-08 00:36:51 brodsom Exp $
|
||||
//
|
||||
|
||||
#define GPRE_MAIN
|
||||
@ -2026,38 +2026,8 @@ static TOK get_token()
|
||||
}
|
||||
else if (class_ & CHR_LETTER) {
|
||||
while (TRUE) {
|
||||
#if (! (defined JPN_EUC || defined JPN_SJIS) )
|
||||
while (classes[c = nextchar()] & CHR_IDENT)
|
||||
*p++ = (TEXT) c;
|
||||
#else
|
||||
p--;
|
||||
while (TRUE) {
|
||||
if (KANJI1(c)) {
|
||||
/* If it is a double byte kanji either EUC or SJIS
|
||||
then handle both the bytes together */
|
||||
|
||||
*p++ = c;
|
||||
c = nextchar();
|
||||
if (!KANJI2(c)) {
|
||||
c = *(--p);
|
||||
break;
|
||||
}
|
||||
else
|
||||
*p++ = c;
|
||||
}
|
||||
else {
|
||||
#ifdef JPN_SJIS
|
||||
if ((SJIS_SINGLE(c)) || (classes[c] & CHR_IDENT))
|
||||
#else
|
||||
if (classes[c] & CHR_IDENT)
|
||||
#endif
|
||||
*p++ = c;
|
||||
else
|
||||
break;
|
||||
}
|
||||
c = nextchar();
|
||||
}
|
||||
#endif /* JPN_SJIS || JPN_EUC */
|
||||
if (c != '-' || sw_language != lang_cobol)
|
||||
break;
|
||||
if (sw_language == lang_cobol && sw_ansi)
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
*
|
||||
*____________________________________________________________
|
||||
*
|
||||
* $Id: gpre_meta.epp,v 1.14 2002-12-16 16:25:09 alexpeshkoff Exp $
|
||||
* $Id: gpre_meta.epp,v 1.15 2003-02-08 00:36:51 brodsom Exp $
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -2201,12 +2201,6 @@ static int upcase( TEXT * from, TEXT * to)
|
||||
|
||||
while (p < end && (c = *from++)) {
|
||||
*p++ = UPPER(c);
|
||||
#ifdef JPN_SJIS
|
||||
/* Do not upcase second byte of a sjis kanji character */
|
||||
|
||||
if (SJIS1(c) && p < end && (c = *from++))
|
||||
*p++ = c;
|
||||
#endif
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
*
|
||||
*____________________________________________________________
|
||||
*
|
||||
* $Id: gpre_meta_boot.cpp,v 1.10 2002-11-30 17:40:24 hippoman Exp $
|
||||
* $Id: gpre_meta_boot.cpp,v 1.11 2003-02-08 00:36:51 brodsom Exp $
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -951,12 +951,6 @@ static int upcase( TEXT * from, TEXT * to)
|
||||
|
||||
while (p < end && (c = *from++)) {
|
||||
*p++ = UPPER(c);
|
||||
#ifdef JPN_SJIS
|
||||
/* Do not upcase second byte of a sjis kanji character */
|
||||
|
||||
if (SJIS1(c) && p < end && (c = *from++))
|
||||
*p++ = c;
|
||||
#endif
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
@ -25,15 +25,12 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: hsh.cpp,v 1.8 2002-12-02 08:25:16 eku Exp $
|
||||
// $Id: hsh.cpp,v 1.9 2003-02-08 00:36:51 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
#include "../gpre/gpre.h"
|
||||
#include "../gpre/parse.h"
|
||||
#ifdef JPN_SJIS
|
||||
#include "../intl/kanji.h"
|
||||
#endif
|
||||
#include "../gpre/hsh_proto.h"
|
||||
#include "../gpre/gpre_proto.h"
|
||||
#include "../gpre/msc_proto.h"
|
||||
@ -269,22 +266,8 @@ static BOOLEAN scompare2( register SCHAR * string1, register SCHAR * string2)
|
||||
SCHAR c1, c2;
|
||||
|
||||
while (c1 = *string1++)
|
||||
#ifndef JPN_SJIS
|
||||
if (!(c2 = *string2++) || (UPPER(c1) != UPPER(c2)))
|
||||
return FALSE;
|
||||
#else
|
||||
{
|
||||
/* Do not upcase second byte of a sjis kanji character */
|
||||
|
||||
if (!(c2 = *string2++) || (UPPER(c1) != UPPER(c2)))
|
||||
return FALSE;
|
||||
|
||||
if (SJIS1(c1) && (c1 = *string1++))
|
||||
if (!(c2 = *string2++) || c1 != c2)
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (*string2)
|
||||
return FALSE;
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: int.cpp,v 1.7 2002-11-30 17:40:24 hippoman Exp $
|
||||
// $Id: int.cpp,v 1.8 2003-02-08 00:36:51 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
@ -75,15 +75,9 @@ static int first_flag = 0;
|
||||
#define BEGIN printa (column, "{")
|
||||
#define END printa (column, "}")
|
||||
|
||||
#if !(defined JPN_SJIS || defined JPN_EUC)
|
||||
#define GDS_VTOV "gds__vtov"
|
||||
#define JRD_VTOF "jrd_vtof"
|
||||
#define VTO_CALL "%s ((const char*)%s, (char*)%s, %d);"
|
||||
#else
|
||||
#define GDS_VTOV "gds__vtov2"
|
||||
#define JRD_VTOF "jrd_vtof2"
|
||||
#define VTO_CALL "%s (%s, %s, %d, %d);"
|
||||
#endif
|
||||
|
||||
|
||||
//____________________________________________________________
|
||||
@ -235,8 +229,6 @@ static void asgn_to( REF reference)
|
||||
GPRE_FLD field = source->ref_field;
|
||||
gen_name(s, source);
|
||||
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
|
||||
#pragma FB_COMPILER_MESSAGE("BUG: Checking for zero pointer - then using it!")
|
||||
// Repeated later down in function gen_emodify, but then
|
||||
// emitting jrd_ftof call.
|
||||
@ -249,23 +241,6 @@ static void asgn_to( REF reference)
|
||||
else if (!field || field->fld_dtype == dtype_cstring)
|
||||
ib_fprintf(out_file, "gds__vtov((const char*)%s, (char*)%s, sizeof (%s));",
|
||||
s, reference->ref_value, reference->ref_value);
|
||||
|
||||
#else
|
||||
|
||||
// To avoid chopping off a double byte kanji character in between
|
||||
// the two bytes, generate calls to gds__ftof2 gds$_vtof2 and
|
||||
// gds$_vtov2 wherever necessary
|
||||
|
||||
if (!field || field->fld_dtype == dtype_text)
|
||||
ib_fprintf(out_file, "gds__ftov2 (%s, %d, %s, sizeof (%s), %d);",
|
||||
s,
|
||||
field->fld_length,
|
||||
reference->ref_value, reference->ref_value, sw_interp);
|
||||
else if (!field || field->fld_dtype == dtype_cstring)
|
||||
ib_fprintf(out_file, "gds__vtov2 (%s, %s, sizeof (%s), %d);",
|
||||
s, reference->ref_value, reference->ref_value, sw_interp);
|
||||
|
||||
#endif
|
||||
else
|
||||
ib_fprintf(out_file, "%s = %s;", reference->ref_value, s);
|
||||
}
|
||||
@ -362,8 +337,6 @@ static void gen_emodify( ACT action, int column)
|
||||
field = reference->ref_field;
|
||||
align(column);
|
||||
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
|
||||
if (field->fld_dtype == dtype_text)
|
||||
ib_fprintf(out_file, "jrd_ftof (%s, %d, %s, %d);",
|
||||
gen_name(s1, source),
|
||||
@ -373,25 +346,6 @@ static void gen_emodify( ACT action, int column)
|
||||
ib_fprintf(out_file, "gds__vtov((const char*)%s, (char*)%s, %d);",
|
||||
gen_name(s1, source),
|
||||
gen_name(s2, reference), field->fld_length);
|
||||
|
||||
#else
|
||||
|
||||
/* To avoid chopping off a double byte kanji character in between
|
||||
the two bytes, generate calls to gds__ftof2 gds$_vtof2 and
|
||||
gds$_vtov2 wherever necessary
|
||||
Cannot find where jrd_fof is defined. It needs Japanization too */
|
||||
|
||||
if (field->fld_dtype == dtype_text)
|
||||
ib_fprintf(out_file, "jrd_ftof (%s, %d, %s, %d);",
|
||||
gen_name(s1, source),
|
||||
field->fld_length,
|
||||
gen_name(s2, reference), field->fld_length);
|
||||
else if (field->fld_dtype == dtype_cstring)
|
||||
ib_fprintf(out_file, "gds__vtov2 (%s, %s, %d, %d);",
|
||||
gen_name(s1, source),
|
||||
gen_name(s2, reference), field->fld_length, sw_interp);
|
||||
|
||||
#endif
|
||||
else
|
||||
ib_fprintf(out_file, "%s = %s;",
|
||||
gen_name(s1, reference), gen_name(s2, source));
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: int_cxx.cpp,v 1.6 2002-11-30 17:40:24 hippoman Exp $
|
||||
// $Id: int_cxx.cpp,v 1.7 2003-02-08 00:36:51 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
@ -71,15 +71,9 @@ static int first_flag = 0;
|
||||
#define BEGIN printa (column, "{")
|
||||
#define END printa (column, "}")
|
||||
|
||||
#if !(defined JPN_SJIS || defined JPN_EUC)
|
||||
#define GDS_VTOV "gds__vtov"
|
||||
#define JRD_VTOF "jrd_vtof"
|
||||
#define VTO_CALL "%s ((const char*)%s, (char*)%s, %d);"
|
||||
#else
|
||||
#define GDS_VTOV "gds__vtov2"
|
||||
#define JRD_VTOF "jrd_vtof2"
|
||||
#define VTO_CALL "%s (%s, %s, %d, %d);"
|
||||
#endif
|
||||
|
||||
|
||||
//____________________________________________________________
|
||||
@ -236,8 +230,6 @@ static void asgn_to( REF reference)
|
||||
field = source->ref_field;
|
||||
gen_name(s, source);
|
||||
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
|
||||
#pragma FB_COMPILER_MESSAGE("BUG: Checking for zero pointer - then using it!")
|
||||
// Repeated later down in function gen_emodify, but then
|
||||
// emitting jrd_ftof call.
|
||||
@ -250,23 +242,6 @@ static void asgn_to( REF reference)
|
||||
else if (!field || field->fld_dtype == dtype_cstring)
|
||||
ib_fprintf(out_file, "gds__vtov((const char*)%s, (char*)%s, sizeof (%s));",
|
||||
s, reference->ref_value, reference->ref_value);
|
||||
|
||||
#else
|
||||
|
||||
// To avoid chopping off a double byte kanji character in between
|
||||
// the two bytes, generate calls to gds__ftof2 gds$_vtof2 and
|
||||
// gds$_vtov2 wherever necessary
|
||||
|
||||
if (!field || field->fld_dtype == dtype_text)
|
||||
ib_fprintf(out_file, "gds__ftov2 (%s, %d, %s, sizeof (%s), %d);",
|
||||
s,
|
||||
field->fld_length,
|
||||
reference->ref_value, reference->ref_value, sw_interp);
|
||||
else if (!field || field->fld_dtype == dtype_cstring)
|
||||
ib_fprintf(out_file, "gds__vtov2 (%s, %s, sizeof (%s), %d);",
|
||||
s, reference->ref_value, reference->ref_value, sw_interp);
|
||||
|
||||
#endif
|
||||
else
|
||||
ib_fprintf(out_file, "%s = %s;", reference->ref_value, s);
|
||||
}
|
||||
@ -364,8 +339,6 @@ static void gen_emodify( ACT action, int column)
|
||||
field = reference->ref_field;
|
||||
align(column);
|
||||
|
||||
#if (! (defined JPN_SJIS || defined JPN_EUC) )
|
||||
|
||||
if (field->fld_dtype == dtype_text)
|
||||
ib_fprintf(out_file, "jrd_ftof (%s, %d, %s, %d);",
|
||||
gen_name(s1, source),
|
||||
@ -375,25 +348,6 @@ static void gen_emodify( ACT action, int column)
|
||||
ib_fprintf(out_file, "gds__vtov((const char*)%s, (char*)%s, %d);",
|
||||
gen_name(s1, source),
|
||||
gen_name(s2, reference), field->fld_length);
|
||||
|
||||
#else
|
||||
|
||||
/* To avoid chopping off a double byte kanji character in between
|
||||
the two bytes, generate calls to gds__ftof2 gds$_vtof2 and
|
||||
gds$_vtov2 wherever necessary
|
||||
Cannot find where jrd_fof is defined. It needs Japanization too */
|
||||
|
||||
if (field->fld_dtype == dtype_text)
|
||||
ib_fprintf(out_file, "jrd_ftof (%s, %d, %s, %d);",
|
||||
gen_name(s1, source),
|
||||
field->fld_length,
|
||||
gen_name(s2, reference), field->fld_length);
|
||||
else if (field->fld_dtype == dtype_cstring)
|
||||
ib_fprintf(out_file, "gds__vtov2 (%s, %s, %d, %d);",
|
||||
gen_name(s1, source),
|
||||
gen_name(s2, reference), field->fld_length, sw_interp);
|
||||
|
||||
#endif
|
||||
else
|
||||
ib_fprintf(out_file, "%s = %s;",
|
||||
gen_name(s1, reference), gen_name(s2, source));
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
//
|
||||
// All Rights Reserved.
|
||||
// Contributor(s): ______________________________________.
|
||||
// $Id: par.cpp,v 1.10 2002-12-06 13:43:10 eku Exp $
|
||||
// $Id: par.cpp,v 1.11 2003-02-08 00:36:51 brodsom Exp $
|
||||
// Revision 1.2 2000/11/27 09:26:13 fsg
|
||||
// Fixed bugs in gpre to handle PYXIS forms
|
||||
// and allow edit.e and fred.e to go through
|
||||
@ -37,7 +37,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: par.cpp,v 1.10 2002-12-06 13:43:10 eku Exp $
|
||||
// $Id: par.cpp,v 1.11 2003-02-08 00:36:51 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
@ -3164,27 +3164,6 @@ static ACT par_open_blob( ACT_T act_op, SYM symbol)
|
||||
else
|
||||
break;
|
||||
|
||||
#if (defined JPN_EUC || defined JPN_SJIS)
|
||||
// If the blob is filtered to sub_type text or
|
||||
// if there is no filter but the actual field's sub_type is text,
|
||||
// set blb_source_interp (for writing) or blb_target_interp (for reading).
|
||||
// These fields will be used for generating proper Blob Parameter Block.
|
||||
|
||||
if ((blob->blb_const_to_type == 1) ||
|
||||
(!filter_is_defined && (field->fld_sub_type == 1))) {
|
||||
switch (act_op) {
|
||||
case ACT_blob_create:
|
||||
blob->blb_source_interp = sw_interp;
|
||||
break;
|
||||
|
||||
case ACT_blob_open:
|
||||
case ACT_blob_for:
|
||||
blob->blb_target_interp = sw_interp;
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif /* (defined JPN_EUC || defined JPN_SJIS) */
|
||||
|
||||
if (!(blob->blb_seg_length = field->fld_seg_length))
|
||||
blob->blb_seg_length = 512;
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: pretty.cpp,v 1.7 2002-12-13 14:50:23 dimitr Exp $
|
||||
// $Id: pretty.cpp,v 1.8 2003-02-08 00:36:51 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
@ -824,34 +824,6 @@ static int print_dyn_verb( CTL control, SSHORT level)
|
||||
PRINT_LINE;
|
||||
return 0;
|
||||
|
||||
#if (defined JPN_SJIS || defined JPN_EUC)
|
||||
|
||||
case gds_dyn_view_source2:
|
||||
case gds_dyn_fld_validation_source2:
|
||||
case gds_dyn_fld_computed_source2:
|
||||
case gds_dyn_description2:
|
||||
case gds_dyn_prc_source2:
|
||||
PRINT_WORD;
|
||||
length = PRINT_WORD;
|
||||
while (length--)
|
||||
PRINT_CHAR;
|
||||
PRINT_LINE;
|
||||
return 0;
|
||||
|
||||
case gds_dyn_fld_edit_string2:
|
||||
case gds_dyn_fld_query_header2:
|
||||
case gds_dyn_trg_msg2:
|
||||
case gds_dyn_trg_source2:
|
||||
PRINT_WORD;
|
||||
if (length = PRINT_WORD)
|
||||
do
|
||||
PRINT_CHAR;
|
||||
while (--length);
|
||||
PRINT_LINE;
|
||||
return 0;
|
||||
|
||||
#endif
|
||||
|
||||
case gds_dyn_del_exception:
|
||||
if (length = PRINT_WORD)
|
||||
do
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
//
|
||||
// All Rights Reserved.
|
||||
// Contributor(s): ______________________________________.
|
||||
// $Id: sqe.cpp,v 1.7 2002-11-30 17:40:24 hippoman Exp $
|
||||
// $Id: sqe.cpp,v 1.8 2003-02-08 00:36:50 brodsom Exp $
|
||||
// Revision 1.3 2000/11/16 15:54:29 fsg
|
||||
// Added new switch -verbose to gpre that will dump
|
||||
// parsed lines to stderr
|
||||
@ -38,7 +38,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: sqe.cpp,v 1.7 2002-11-30 17:40:24 hippoman Exp $
|
||||
// $Id: sqe.cpp,v 1.8 2003-02-08 00:36:50 brodsom Exp $
|
||||
//
|
||||
#include "firebird.h"
|
||||
#include <stdio.h>
|
||||
@ -3542,13 +3542,6 @@ static char *upcase_string( char *p)
|
||||
|
||||
while ((c = *p++) && (++l <= NAME_SIZE)) {
|
||||
*q++ = UPPER7(c);
|
||||
#ifdef JPN_SJIS
|
||||
|
||||
/* Do not upcase second byte of a sjis kanji character */
|
||||
|
||||
if (SJIS1(c) && (c = *p++) && (++l <= NAME_SIZE))
|
||||
*q++ = c;
|
||||
#endif
|
||||
}
|
||||
*q = 0;
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
//
|
||||
//____________________________________________________________
|
||||
//
|
||||
// $Id: sql.cpp,v 1.7 2002-12-06 13:43:10 eku Exp $
|
||||
// $Id: sql.cpp,v 1.8 2003-02-08 00:36:50 brodsom Exp $
|
||||
//
|
||||
|
||||
#include "firebird.h"
|
||||
@ -6389,13 +6389,6 @@ static void to_upcase( TEXT * p, TEXT * q)
|
||||
l = 0;
|
||||
while ((c = *p++) && (++l <= NAME_SIZE)) {
|
||||
*q++ = UPPER(c);
|
||||
#ifdef JPN_SJIS
|
||||
|
||||
/* Do not upcase second byte of a sjis kanji character */
|
||||
|
||||
if (SJIS1(c) && (c = *p++) && (++l <= NAME_SIZE))
|
||||
*q++ = c;
|
||||
#endif
|
||||
}
|
||||
*q = 0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user