COMMON: remove obsolete/unimplemented keywords

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2015-08-02
 	Fix display output before DELAY
+	Removed obsolete/unimplemented keywords WSPLIT, PLOT2, UNLOADLIB
 
 2015-07-18
 	Added IDE editor sdl/android

documentation/sbasic_ref.csv

@@ -130,7 +130,7 @@ Language,function,IFF,638,"IFF expr","Inline version of IF. eg, animal = ""cat""
 Language,keyword,BYREF,639,"BYREF","Sub/func argument declaration. Changes to the variable will be passed back to the caller.  Equivalent syntax to the @ character."
 Language,keyword,CASE,640,"CASE expr","Branch condition for a SELECT statement."
 Language,keyword,DEF,641,"DEF name[(par1[,...])] = expression","Defines a single line function. eg, DEF MySin(x) = SIN(x): ? MySin(pi/2)"
-Language,keyword,DO,642,"DO","FOR f IN files("*.txt") DO PRINT f"
+Language,keyword,DO,642,"DO","FOR f IN files(""*.txt"") DO PRINT f"
 Language,keyword,ELIF,643,"ELIF","foo = 2: if foo==1: ? ""one"": ELIF foo==2: ? ""two"": fi"
 Language,keyword,ELSE,644,"ELSE","foo = 2: if foo==1: ? ""one"": ELSE: ? ""not one"": fi"
 Language,keyword,ELSEIF,645,"ELSEIF","foo = 2: if foo==1: ? ""one"": ELSEIF foo==2: ? ""two"": fi"
@@ -241,9 +241,9 @@ String,command,SINPUT,768,"SINPUT src; var [, delim] [,var [, delim]] ...","Spli
 String,command,SPLIT,769,"SPLIT string, delimiters, words() [, pairs] [USE expr]","Returns the words of the specified string into array 'words'."
 String,command,SPRINT,770,"SPRINT var; [USING...;] ...","Create formated string and storing it to var. See also: PRINT command."
 String,function,ASC,771,"ASC (s)","Returns the ASCII code of first character of the string s."
-String,function,BCS,772,"BCS (s)","converts (B)ASIC-style strings to (C)-style (S)trings."
+String,function,BCS,772,"BCS (s)","Converts (B)ASIC-style strings to (C)-style (S)trings."
 String,function,BIN,773,"BIN (x)","Returns the binary value of x as string."
-String,function,CBS,774,"CBS (s)","converts (C)-style strings to (B)ASIC-style (S)trings."
+String,function,CBS,774,"CBS (s)","Converts (C)-style strings to (B)ASIC-style (S)trings."
 String,function,CHOP,775,"CHOP (source)","Chops off the last character of the string 'source' and returns the result."
 String,function,CHR,776,"CHR (x)","Returns one-char string of character with ASCII code x."
 String,function,DISCLOSE,777,"DISCLOSE (str[, pairs [, ignore-pairs]])","Discloses a string."
@@ -292,19 +292,16 @@ System,function,TIMER,821,"TIMER","Returns the number of seconds from midnight."
 Language,keyword,DECLARE,0,"DECLARE FUNC xxx","Forward declare SUB or FUNC. Obsolete QB compatibility"
 Language,keyword,TO,0,"FOR t = 1 TO 10","Specifies the loop counter end in a FOR loop"
 Language,keyword,STEP,0,"FOR t = 1 TO 10 STEP 2","Specifies the loop counter increment in a FOR loop"
-Language,keyword,USING,0,"",""
-Language,keyword,USG,0,"",""
-Language,keyword,AS,0,"",""
+Language,keyword,USING,0,"PRINT USING","See PRINT, SPRINT"
+Language,keyword,USG,0,"PRINT USG","Synonym for USING"
+Language,keyword,AS,0,"AS #fileN","See: OPEN"
 Language,keyword,TRY,0,"TRY","The TRY statement introduces a TRY/CATCH BLOCK"
 Language,keyword,CATCH,0,"CATCH [var | expr]","The CATCH statement is used to CATCH an run-time error. This is typically used with errors raised when calling a file system command that cannot be completed, for example attempting to open a non-existent file. The CATCH statement has two modes. You can supply a variable argument to store the error string. Alternatively you can supply an expression. When the raised error matches the (String) expression, the error will be caught. When using the expression mode, you can supply a succession of CATCH statements to handle various error messages separately."
 Language,keyword,END TRY,0,"END TRY","The END TRY statement marks the end of a TRY/CATCH block."
 Language,keyword,BG,0,"SOUND frq, dur [, vol] [BG]","Play sound in the background. This prevent the program from blocking while the sound plays."
 Language,function,THROW,0,"THROW","The THROW command (previously known as RTE) is used to initiate a catch-able error. If there is no surrounding TRY/CATCH block, THROW can be used to abort the program."
-Graphics,command,PLOT2,0,"",""
-String,function,WSPLIT,0,"",""
-System,command,UNLOADLIB,0,"",""
 Graphics,command,SHOWPAGE,0,"SHOWPAGE","This command is used to display pending graphics operations allowing for smooth animations."
 Data,function,ISMAP,0,"ISMAP (x)","Returns true if x is an MAP variable type. A MAP provides value-key pair access along with array or dotted notation. The MAP can be initialized from a String variable using the ARRAY command"
-Data,function,ISREF,0,"ISREF (x)","Returns true if x is a reference variable type. The REF variable type is a "reference" to another variable (like a pointer in c). You create a reference by assigning a variable with the BYREF keyword (or @ symbol)."
+Data,function,ISREF,0,"ISREF (x)","Returns true if x is a reference variable type. The REF variable type is a ""reference"" to another variable (like a pointer in c). You create a reference by assigning a variable with the BYREF keyword (or @ symbol)."
 Data,function,ARRAY,0,"ARRAY [var | expr]","Creates a ARRAY or MAP variable from the given string or expression"
 Console,command,FORM,0,"FORM","Create a form widget. "

src/common/brun.c

@@ -553,9 +553,6 @@ static inline void bc_loop_call_proc() {
   case kwRANDOMIZE:
     cmd_randomize();
     break;
-  case kwWSPLIT:
-    cmd_wsplit();
-    break;
   case kwSPLIT:
     cmd_split();
     break;
@@ -658,9 +655,6 @@ static inline void bc_loop_call_proc() {
   case kwCHMOD:
     cmd_chmod();
     break;
-  case kwPLOT2:
-    cmd_plot2();
-    break;
   case kwPLOT:
     cmd_plot();
     break;

src/common/kw.h

@@ -199,7 +199,6 @@ enum proc_keywords {
   kwCIRCLE,
   kwRANDOMIZE,
   kwSPLIT,
-  kwWSPLIT,
   kwWJOIN,
   kwPAUSE,
   kwDELAY,
@@ -233,7 +232,6 @@ enum proc_keywords {
   kwRMDIR,
   kwFLOCK,
   kwCHMOD,
-  kwPLOT2,
   kwPLOT,
   kwSTKDUMP,
   kwSWAP,
@@ -243,7 +241,6 @@ enum proc_keywords {
   kwBSAVE,
   kwTIMEHMS,
   kwEXPRSEQ,
-  kwUNLOADLIB,
   kwCALLCP,
   kwDEFINEKEY,
   kwSHOWPAGE,

src/languages/keywords.en.c

@@ -375,7 +375,6 @@ struct proc_keyword_s proc_table[] = {
 { "CIRCLE",             kwCIRCLE },
 { "RANDOMIZE",          kwRANDOMIZE },
 { "SPLIT",              kwSPLIT },
-{ "WSPLIT",             kwWSPLIT },
 { "JOIN",               kwWJOIN },
 { "PAUSE",              kwPAUSE },
 { "DELAY",              kwDELAY },
@@ -409,7 +408,6 @@ struct proc_keyword_s proc_table[] = {
 { "TSAVE",              kwSAVELN },
 { "LOCK",               kwFLOCK },
 { "CHMOD",              kwCHMOD },
-{ "PLOT2",              kwPLOT2 },
 { "PLOT",               kwPLOT },
 { "SWAP",               kwSWAP },
 { "DIRWALK",            kwDIRWALK },
@@ -418,7 +416,6 @@ struct proc_keyword_s proc_table[] = {
 { "BSAVE",              kwBSAVE },
 { "TIMEHMS",            kwTIMEHMS },
 { "EXPRSEQ",            kwEXPRSEQ },
-{ "UNLOADLIB",          kwUNLOADLIB },
 { "CALL",               kwCALLCP },
 { "DEFINEKEY",          kwDEFINEKEY },
 { "SHOWPAGE",           kwSHOWPAGE },

src/platform/sdl/runtime.cpp

@@ -499,7 +499,7 @@ void Runtime::optionsBox(StringList *items) {
   width += (charWidth * OPTIONS_BOX_WIDTH_EXTRA);
 
   int charHeight = _output->getCharHeight();
-  int textHeight = charHeight + (charHeight / 3);
+  int textHeight = charHeight + (charHeight / 2);
   int height = textHeight * items->size();
   if (_menuX + width >= _output->getWidth()) {
     _menuX = _output->getWidth() - width;