Patch level : xx.282
Files correlati : Ricompilazione Demo : [ ] Commento : Riportata la versione 01.05 patch 282 git-svn-id: svn://10.65.10.50/trunk@8022 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex
parent
583a7074cb
commit
575e46d577
@ -38,12 +38,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __LONGDOUBLE__
|
||||
//typedef unsigned int word;
|
||||
#define ELLIPSES ...
|
||||
#else
|
||||
#include <gm.h>
|
||||
#endif
|
||||
|
||||
#define CHR(c) (c)
|
||||
#define ORD(c) (c)
|
||||
@ -134,91 +129,14 @@ typedef long TrDate;
|
||||
typedef char PathSt[82];
|
||||
|
||||
extern Str80 cprefix;
|
||||
//extern TrDate dt;
|
||||
//extern Str8 sdt;
|
||||
//extern char months[12][12];
|
||||
//extern BOOLEAN iscolordisp;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
uchar *ustrchr(uchar *, uchar);
|
||||
uchar *setof(uchar *, ELLIPSES);
|
||||
uchar *delset(uchar *, ELLIPSES);
|
||||
int positn(char *, char *, int);
|
||||
void cdate(char *);
|
||||
void ctimeloc(char *);
|
||||
uchar CReadKeyb(void);
|
||||
char *ToASCIIZ(char *);
|
||||
char *ToASCII(char *);
|
||||
void CDispStatus(char *);
|
||||
BOOLEAN cverdata(char *);
|
||||
TrDate cpackdata(char *);
|
||||
void ceditdata(TrDate ,char *);
|
||||
void cgetdata(TrDate *,char *);
|
||||
void cputdata(char *);
|
||||
int month(TrDate);
|
||||
int year(TrDate);
|
||||
int day(TrDate);
|
||||
TrDate makedata(int,int,int);
|
||||
TrDate addmonth(TrDate,int);
|
||||
TrDate addyear(TrDate,int);
|
||||
void cgettime(char *);
|
||||
char *CCopy(char *,int ,int );
|
||||
int CBitPos(int );
|
||||
BOOLEAN CGetAut(int );
|
||||
char *CGetConf(int );
|
||||
void CMaskP(char *,char *,int , int);
|
||||
// char *CUpString(char *);
|
||||
// char *CLowString(char *);
|
||||
/* @(!) 2.3.00.21 */
|
||||
char *strfset(char *, char *);
|
||||
/* @(:) 2.3.00.21 */
|
||||
char CSetDrive(char );
|
||||
char CGetDrive(void );
|
||||
int CMkDir(char *);
|
||||
int CRmDir(char *);
|
||||
int CChgDir(char *);
|
||||
int CRenameFil(char *,char *);
|
||||
int CRenameDir(char *,char *);
|
||||
int CGetDir(char *);
|
||||
long CDiskSpace(char );
|
||||
void CSetString(char *,char *,BOOLEAN, BOOLEAN, int ,int ,char );
|
||||
BOOLEAN ckeypress(void );
|
||||
void genhelp(void );
|
||||
uchar CReadKeyb(void );
|
||||
char *esc(char *);
|
||||
void CInitProg(void );
|
||||
void CEndProg(void );
|
||||
int execprog(int ,char *, ELLIPSES);
|
||||
|
||||
#ifndef __LONGDOUBLE__
|
||||
void CEditDec(DEC *,int ,int ,char *);
|
||||
void CConvDec(char *,DEC *);
|
||||
#endif
|
||||
|
||||
int CIOResult(void );
|
||||
// TDitta *CGetDitta(char *);
|
||||
// void CPutDitta(char *,TDitta *);
|
||||
void CClearKb(void );
|
||||
void crtrim(char *);
|
||||
void cltrim(char *);
|
||||
void CSplitString(char *,int ,char *,char *);
|
||||
void CSpace(char *, int);
|
||||
uchar editpref(BOOLEAN, BOOLEAN, BOOLEAN);
|
||||
char **getlinefd(char *, char, char);
|
||||
// word getkeyid(void);
|
||||
// void addtokeybar(char *, word);
|
||||
// void delfromkeybar(word);
|
||||
// uchar *setofkeybar(word);
|
||||
/* @(!) 2.3.01.134 */
|
||||
// uchar *strsetofkeybar(char *);
|
||||
/* @(:) 2.3.01.134 */
|
||||
/* @(!) 2.3.01.223 */
|
||||
// void suspendkey(char *);
|
||||
// void resumekey(char *);
|
||||
/* @(:) 2.3.01.223 */
|
||||
/* @(!) 2.3.01.316 */
|
||||
#ifdef DOS
|
||||
void tmpfname(char *,char *);
|
||||
#endif
|
||||
|
||||
@ -925,7 +925,7 @@ TString& TFile_text::format_field(const TTracciato_campo& tc, short lfile, TStri
|
||||
const TRectype record(tc.field().file() ? tc.field().file() : lfile);
|
||||
|
||||
int length = flength(tc,record);
|
||||
const bool is_memo = record.type(tc.field().name());
|
||||
const bool is_memo = record.type(tc.field().name()) == _memofld;
|
||||
|
||||
if (!fpicture(tc).blank())
|
||||
{ TString tmp;
|
||||
|
||||
@ -654,7 +654,7 @@ void TForm_item::set_picture(const char*)
|
||||
TToken_string& TForm_item::memo_info()
|
||||
{
|
||||
CHECK(0, "Can't get a memo of a generic form item!");
|
||||
return TToken_string();
|
||||
return (TToken_string &) EMPTY_STRING;
|
||||
}
|
||||
|
||||
short TForm_item::x()
|
||||
@ -959,7 +959,7 @@ bool TForm_subsection::print_body(sec_print_mode showfields)
|
||||
else
|
||||
again= cur->next_match(_file_id);
|
||||
} while (again);
|
||||
ok |=_ssec.repeat_count()>0; // (ovvero, sempre true: se c'e' un first match)
|
||||
ok |= (_ssec.repeat_count()>0); // (ovvero, sempre true: se c'e' un first match)
|
||||
}
|
||||
// _ssec.set_repeat_count(0);
|
||||
}
|
||||
@ -2289,8 +2289,8 @@ class TForm_skip_info : public TObject
|
||||
protected:
|
||||
virtual TObject * dup() const;
|
||||
public :
|
||||
bool match_result;
|
||||
int match_number;
|
||||
bool _match_result;
|
||||
int _match_number;
|
||||
~TForm_skip_info(){};
|
||||
TForm_skip_info();
|
||||
};
|
||||
@ -2298,15 +2298,15 @@ public :
|
||||
TObject * TForm_skip_info ::dup() const
|
||||
{
|
||||
TForm_skip_info *p=new TForm_skip_info;
|
||||
p->match_result=match_result;
|
||||
p->match_number=match_number;
|
||||
p->_match_result=_match_result;
|
||||
p->_match_number=_match_number;
|
||||
return p;
|
||||
}
|
||||
|
||||
TForm_skip_info::TForm_skip_info()
|
||||
{
|
||||
match_result=FALSE;
|
||||
match_number=0;
|
||||
_match_result=FALSE;
|
||||
_match_number=0;
|
||||
}
|
||||
|
||||
TForm_editor& TForm::editor() const
|
||||
@ -2413,7 +2413,7 @@ bool TForm::parse_sortedjoin(TScanner& scanner)
|
||||
if (filter.empty() && sortexp.empty())
|
||||
yesnofatal_box("Sort senza espressioni di ordinamento o filtri");
|
||||
TRelation * sortrel=new TRelation(atoi(j));
|
||||
while (ok && scanner.popkey() != "JO" )
|
||||
while (ok() && scanner.popkey() != "JO" )
|
||||
{
|
||||
if (scanner.key() == "US") // USING keyword
|
||||
{
|
||||
@ -4445,10 +4445,10 @@ void TForm::match_result(int file,int val)
|
||||
{
|
||||
TForm_skip_info info;
|
||||
if (next_match_done(file))
|
||||
info.match_number=((TForm_skip_info &)_skip_info[file]).match_number;
|
||||
info._match_number=((TForm_skip_info &)_skip_info[file])._match_number;
|
||||
if (val)
|
||||
info.match_number++;
|
||||
info.match_result=val;
|
||||
info._match_number++;
|
||||
info._match_result= val != 0;
|
||||
_skip_info.add(info,file);
|
||||
}
|
||||
}
|
||||
@ -4458,7 +4458,7 @@ bool TForm::last_match_result(int file)
|
||||
if (file==0)
|
||||
file=cursor()->file().num();
|
||||
if (next_match_done(file))
|
||||
return ((TForm_skip_info &)_skip_info[file]).match_result;
|
||||
return ((TForm_skip_info &)_skip_info[file])._match_result;
|
||||
return fatal_box("Tryed to get result of a never executed skip in file %d",file);
|
||||
}
|
||||
// @mfunc Memorizza l'avvenuto next_match sul file passato
|
||||
@ -4475,7 +4475,7 @@ int TForm::matches_done(int file)
|
||||
if (file==0)
|
||||
file=cursor()->file().num();
|
||||
if (next_match_done(file))
|
||||
return ((TForm_skip_info &)_skip_info[file]).match_number;
|
||||
return ((TForm_skip_info &)_skip_info[file])._match_number;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -2395,7 +2395,7 @@ void TRectype::init(int logicnum)
|
||||
|
||||
_logicnum = logicnum;
|
||||
|
||||
CHECK(_logicnum < EXTERNAL_FILE,"Impossibile costruire un record di un file esterno");
|
||||
CHECK(_logicnum < LF_EXTERNAL,"Impossibile costruire un record di un file esterno");
|
||||
|
||||
if (openf[_logicnum - 1] != NULL)
|
||||
{
|
||||
|
||||
@ -452,7 +452,7 @@ real& real::operator /= (const real & b)
|
||||
|
||||
bool real::is_zero () const
|
||||
{
|
||||
return (bool) diszero (ptr ());
|
||||
return diszero (ptr ()) != 0;
|
||||
}
|
||||
|
||||
// @doc EXTERNAL
|
||||
@ -794,7 +794,7 @@ bool operator > (
|
||||
// @syntax operator <gt> (const real &a, const real &b);
|
||||
// @syntax operator <gt> (double a, const real &b);
|
||||
{
|
||||
return disgt (a.ptr (), b.ptr ());
|
||||
return disgt (a.ptr (), b.ptr ()) != 0;
|
||||
}
|
||||
|
||||
bool operator > (double a, const real & b)
|
||||
@ -821,7 +821,7 @@ bool operator < (
|
||||
// @syntax operator <lt> (double a, const real &b);
|
||||
|
||||
{
|
||||
return dislt (a.ptr (), b.ptr ());
|
||||
return dislt (a.ptr (), b.ptr ()) != 0;
|
||||
}
|
||||
|
||||
bool operator < (double a, const real & b)
|
||||
@ -850,7 +850,7 @@ bool operator >= (
|
||||
// @syntax operator <gt>= (double a, const real &b);
|
||||
|
||||
{
|
||||
return disge (a.ptr (), b.ptr ());
|
||||
return disge (a.ptr (), b.ptr ()) != 0;
|
||||
}
|
||||
|
||||
bool operator >= (double a, const real & b)
|
||||
@ -878,7 +878,7 @@ bool operator <= (
|
||||
// @syntax operator <lt>= (const real &a, const real &b);
|
||||
// @syntax operator <lt>= (double a, const real &b);
|
||||
{
|
||||
return disle (a.ptr (), b.ptr ());
|
||||
return disle (a.ptr (), b.ptr ()) != 0;
|
||||
}
|
||||
|
||||
bool operator <= (double a, const real & b)
|
||||
@ -905,7 +905,7 @@ bool operator == (
|
||||
// @syntax operator == (const real &a, const real &b);
|
||||
// @syntax operator == (double a, const real &b);
|
||||
{
|
||||
return diseq (a.ptr (), b.ptr ());
|
||||
return diseq (a.ptr (), b.ptr ()) != 0;
|
||||
}
|
||||
|
||||
bool operator == (double a, const real & b)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user