Commit ca36dade authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl

remove old STRING type from backend (string_type,stringsym and StringObj)

parent ed90776f
......@@ -3617,7 +3617,6 @@ CheckBEEnumTypes (void)
Assert (char_type == BECharType);
Assert (real_type == BERealType);
Assert (file_type == BEFileType);
Assert (string_type == BEStringType);
Assert (world_type == BEWorldType);
Assert (procid_type == BEProcIdType);
Assert (redid_type == BERedIdType);
......
......@@ -17,7 +17,6 @@ char *ConvertSymbolKindToString (SymbKind skind)
case int_type: return ReservedWords [(int) intsym];
case bool_type: return ReservedWords [(int) boolsym];
case char_type: return ReservedWords [(int) charsym];
case string_type: return ReservedWords [(int) stringsym];
case real_type: return ReservedWords [(int) realsym];
case file_type: return ReservedWords [(int) filesym];
case array_type: return ReservedWords [(int) arraysym];
......
......@@ -95,7 +95,6 @@ InitParser (void)
BasicTypeSymbols [int_type] = NewPredefinedTypeSymbol (int_type, intsym, & gBasicTypeIdents [int_type]);
BasicTypeSymbols [bool_type] = NewPredefinedTypeSymbol (bool_type, boolsym, & gBasicTypeIdents [bool_type]);
BasicTypeSymbols [char_type] = NewPredefinedTypeSymbol (char_type, charsym, & gBasicTypeIdents [char_type]);
BasicTypeSymbols [string_type] = NewPredefinedTypeSymbol (string_type, stringsym, & gBasicTypeIdents [string_type]);
BasicTypeSymbols [real_type] = NewPredefinedTypeSymbol (real_type, realsym, & gBasicTypeIdents [real_type]);
BasicTypeSymbols [file_type] = NewPredefinedTypeSymbol (file_type, filesym, & gBasicTypeIdents [file_type]);
BasicTypeSymbols [world_type] = NewPredefinedTypeSymbol (world_type, worldsym, & gBasicTypeIdents [world_type]);
......
......@@ -37,7 +37,6 @@ static void PrintUnaryState (StateKind kind, ObjectKind obj, File file)
case IntObj: FPutS ("Int ", file); break;
case BoolObj: FPutS ("Bool ", file); break;
case CharObj: FPutS ("Char ", file); break;
case StringObj: FPutS ("String ", file); break;
case RealObj: FPutS ("Real ", file); break;
case FileObj: FPutS ("File ", file); break;
case TupleObj: FPutS ("Tuple ", file); break;
......
......@@ -517,7 +517,6 @@ enum {
#define IbuildC "buildC"
#define IbuildI "buildI"
#define IbuildR "buildR"
#define IbuildS "buildS"
#define IbuildB_b "buildB_b"
#define IbuildC_b "buildC_b"
......@@ -529,7 +528,6 @@ enum {
#define IfillC "fillC"
#define IfillI "fillI"
#define IfillR "fillR"
#define IfillS "fillS"
#define IfillB_b "fillB_b"
#define IfillC_b "fillC_b"
......@@ -541,7 +539,6 @@ enum {
#define IeqC_a "eqC_a"
#define IeqI_a "eqI_a"
#define IeqR_a "eqR_a"
#define IeqS_a "eqS_a"
#define IeqAC_a "eqAC_a"
......@@ -812,10 +809,6 @@ void BuildBasic (ObjectKind obj,SymbValue val)
put_instruction_ (IbuildR);
FPrintF (OutFile, "%s", val.val_real);
break;
case StringObj:
put_instruction_ (IbuildS);
FPrintF (OutFile, "%s", val.val_string);
break;
default:
error_in_function ("BuildBasic");
return;
......@@ -845,10 +838,6 @@ void FillBasic (ObjectKind obj, SymbValue val, int offset, FillKind fkind)
put_instruction_ (IfillR);
FPrintF (OutFile, "%s %d", val.val_real, offset);
break;
case StringObj:
put_instruction_ (IfillS);
FPrintF (OutFile, "%s %d", val.val_string, offset);
break;
default:
error_in_function ("FillBasic");
return;
......@@ -876,9 +865,6 @@ void IsBasic (ObjectKind obj, SymbValue val, int offset)
case RealObj:
put_instruction_ (IeqR_a);
FPrintF (OutFile, "%s %d", val.val_real, offset); break;
case StringObj:
put_instruction_ (IeqS_a);
FPrintF (OutFile, "%s %d", val.val_string, offset); break;
default:
error_in_function ("IsBasic");
return;
......
......@@ -14,7 +14,7 @@ typedef
boolsym, codesym, charsym,
falsesym, filesym, fromsym, ifsym,
intsym, procidsym, redidsym,
realsym, stringsym,
realsym,
truesym, applysym,
worldsym,
NumberOfKeywords /* make sure that this constant is the last one */
......
......@@ -596,9 +596,6 @@ ScanInitIdentStringTable (void)
ReservedWords [(int) procidsym] = "ProcId";
ReservedWords [(int) redidsym] = "RedId";
ReservedWords [(int) realsym] = "Real";
/* */
ReservedWords [(int) stringsym] = "_STRING";
/* */
ReservedWords [(int) truesym] = "True";
ReservedWords [(int) applysym] = "=>";
ReservedWords [(int) worldsym] = "World";
......
......@@ -4424,7 +4424,6 @@ void InitStatesGen (void)
SetUnaryState (& BasicSymbolStates[int_type], OnB, IntObj);
SetUnaryState (& BasicSymbolStates[bool_type], OnB, BoolObj);
SetUnaryState (& BasicSymbolStates[char_type], OnB, CharObj);
SetUnaryState (& BasicSymbolStates[string_type], StrictOnA, StringObj);
SetUnaryState (& BasicSymbolStates[real_type], OnB, RealObj);
SetUnaryState (& BasicSymbolStates[file_type], OnB, FileObj);
SetUnaryState (& BasicSymbolStates[world_type], StrictOnA, WorldObj);
......
......@@ -25,7 +25,7 @@ typedef enum {
#if ABSTRACT_OBJECT
AbstractObj,
#endif
IntObj, BoolObj, CharObj, RealObj, FileObj, StringObj,
IntObj, BoolObj, CharObj, RealObj, FileObj, unusedObjectKind0/*StringObj*/,
TupleObj, ListObj, RecordObj, ArrayObj, StrictArrayObj, UnboxedArrayObj,
WorldObj, ProcIdObj, RedIdObj
#ifdef CLEAN2
......@@ -42,7 +42,7 @@ typedef enum {
typedef enum {
int_type, bool_type, char_type, real_type,
file_type, string_type, world_type, procid_type,
file_type, unusedSymbKind0/*string_type*/, world_type, procid_type,
redid_type,
#ifdef CLEAN2
rational_denot,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment