Merge /u/bruno-w/newrpl/ branch master into master

https://sourceforge.net/p/newrpl/sources/merge-requests/31/
This commit is contained in:
Claudio L 2016-11-23 03:34:05 +00:00
commit fc6b6691b5
6 changed files with 26 additions and 6 deletions

View file

@ -53,6 +53,8 @@
CMD(BYTES,MKTOKENINFO(5,TITYPE_NOTALLOWED,1,2)), \
CMD(PEEK,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2)), \
CMD(POKE,MKTOKENINFO(4,TITYPE_NOTALLOWED,1,2)), \
CMD(NEWOB,MKTOKENINFO(5,TITYPE_NOTALLOWED,1,2)), \
CMD(GARBAGE,MKTOKENINFO(7,TITYPE_NOTALLOWED,1,2)), \
CMD(MEMCHECK,MKTOKENINFO(8,TITYPE_NOTALLOWED,1,2)), \
CMD(MEMFIX,MKTOKENINFO(6,TITYPE_NOTALLOWED,1,2)), \
CMD(READCFI,MKTOKENINFO(7,TITYPE_NOTALLOWED,1,2)), \
@ -916,6 +918,9 @@ void LIB_HANDLER()
rplCallOvrOperator(CMD_OVR_EVAL);
return;
}
case GARBAGE:
rplGCollect();
return;
case MEMCHECK:
{
// SYSTEM SANITY CHECK

View file

@ -211,6 +211,12 @@ const systemflag const flags_names[]= {
{ "DATEMDY" , { (-FL_DATEFORMAT),0,0,0,0,0,0,0} },
{ "TIME12" , { (-FL_TIMEFORMAT),0,0,0,0,0,0,0} },
{ "TIME24" , { 0x80|(-FL_TIMEFORMAT),0,0,0,0,0,0,0} },
{ "BEEPON" , { (-FL_ERRORBEEP),0,0,0,0,0,0,0} },
{ "BEEPOFF" , { 0x80|(-FL_ERRORBEEP),0,0,0,0,0,0,0} },
{ "ALMBEEPON" , { (-FL_ALARMBEEP),0,0,0,0,0,0,0} },
{ "ALMBEEPOFF" , { 0x80|(-FL_ALARMBEEP),0,0,0,0,0,0,0} },
{ "SAVEALM" , { 0x80|(-FL_SAVACKALRM),0,0,0,0,0,0,0} },
{ "RESCALM" , { (-FL_RESRPTALRM),0,0,0,0,0,0,0} },
@ -416,7 +422,7 @@ BINT rplSetSystemFlagByIdent(WORDPTR ident)
BINT rplClrSystemFlagByIdent(WORDPTR ident)
{
BYTEPTR text=(BYTEPTR)(ident+1);
return rplSetSystemFlagByName(text,text+rplGetIdentLength(ident));
return rplClrSystemFlagByName(text,text+rplGetIdentLength(ident));
}
BINT rplTestSystemFlagByIdent(WORDPTR ident)

View file

@ -31,7 +31,6 @@
// COMMAND NAME TEXT ARE GIVEN SEPARATEDLY
#define COMMAND_LIST \
CMD(GARBAGE,MKTOKENINFO(7,TITYPE_NOTALLOWED,1,2)), \
ECMD(UNPROTECTSTACK,"",MKTOKENINFO(0,TITYPE_NOTALLOWED,1,2)), \
CMD(CLEAR,MKTOKENINFO(5,TITYPE_NOTALLOWED,1,2)), \
CMD(DEPTH,MKTOKENINFO(5,TITYPE_NOTALLOWED,1,2)), \
@ -126,9 +125,6 @@ void LIB_HANDLER()
switch(OPCODE(CurOpcode))
{
case GARBAGE:
rplGCollect();
return;
case CLEAR:
// ONLY CLEAR UP TO THE STACK PROTECTED AREA
// DON'T THROW AN ERROR

View file

@ -660,6 +660,10 @@ void rplHMSToDecimal(REAL *hms, REAL *dec);
#define FL_STRIPCOMMENTS -30
#define FL_TIMEFORMAT -41
#define FL_DATEFORMAT -42
#define FL_RESRPTALRM -43
#define FL_SAVACKALRM -44
#define FL_ERRORBEEP -56
#define FL_ALARMBEEP -57
#define FL_COMPLEXMODE -103
#define FL_INERRORHANDLER -4

View file

@ -24,7 +24,8 @@
@#name lib65_menu_1_memory
{
MEM BYTES PEEK POKE VERSION
MEM BYTES NEWOB GARBAGE VERSION
PEEK POKE
}
@#name lib65_menu_2_alarms

View file

@ -168,6 +168,14 @@ DD.MMYYYY or MM.DDYYYY
24-hours or 12-hours"
}
@ "BEEP" FLAG TOGGLE
{
:: ##1,MAKESINT(FL_ERRORBEEP) IF FS? THEN "BEEP" ELSE "■BEEP" END ;
:: ##1,MAKESINT(FL_ERRORBEEP) IF DUP FS? THEN CF ELSE SF END ; @ ACTION: NO SHIFTS
"Error and BEEP command:
sound disabled when set"
}
}