Browse Source

Get rid of ARRAY OF CHAR in favor of STRING

Vladislav Folts 11 years ago
parent
commit
6ed2a97b83
3 changed files with 6 additions and 6 deletions
  1. 1 1
      src/ob/Lexer.ob
  2. 4 4
      src/ob/Operator.ob
  3. 1 1
      src/ob/Stream.ob

+ 1 - 1
src/ob/Lexer.ob

@@ -195,7 +195,7 @@ PROCEDURE separator*(stream: Stream.Type; context: Context.Type): BOOLEAN;
     RETURN Stream.eof(stream) OR ~isLetter(Stream.peekChar(stream))
 END separator;
 
-PROCEDURE makeLiteral*(s: ARRAY OF CHAR): Literal;
+PROCEDURE makeLiteral*(s: STRING): Literal;
 VAR
     result: Literal;
 BEGIN

+ 4 - 4
src/ob/Operator.ob

@@ -135,7 +135,7 @@ PROCEDURE binaryWithCodeEx(
     left, right: Code.PExpression; 
     rtl: OberonRtl.PType;
     op: BinaryOp;
-    code: ARRAY OF CHAR;
+    code: STRING;
     precedence: INTEGER;
     optResultType: Types.PType;
     optResultPrecedence: INTEGER
@@ -155,7 +155,7 @@ PROCEDURE binaryWithCode*(
     left, right: Code.PExpression; 
     rtl: OberonRtl.PType;
     op: BinaryOp;
-    code: ARRAY OF CHAR;
+    code: STRING;
     precedence: INTEGER
     ): Code.PExpression;
     RETURN binaryWithCodeEx(left, right, rtl, op, code, precedence, NIL, Precedence.none)
@@ -182,7 +182,7 @@ PROCEDURE binaryInt(
     left, right: Code.PExpression; 
     rtl: OberonRtl.PType;
     op: BinaryOp;
-    code: ARRAY OF CHAR;
+    code: STRING;
     precedence: INTEGER
     ): Code.PExpression;
     RETURN promoteToWideIfNeeded(binary(
@@ -443,7 +443,7 @@ PROCEDURE codeSetInclR(left, right: STRING; rtl: OberonRtl.PType): STRING;
     RETURN rtl.setInclR(left, right)
 END codeSetInclR;
 
-PROCEDURE strCmp(op: ARRAY OF CHAR; left, right: Code.PExpression; rtl: OberonRtl.PType): Code.PExpression;
+PROCEDURE strCmp(op: STRING; left, right: Code.PExpression; rtl: OberonRtl.PType): Code.PExpression;
 BEGIN   
     RETURN Code.makeSimpleExpression(
             rtl.strCmp(castToStr(left, rtl), castToStr(right, rtl)) + op + "0",

+ 1 - 1
src/ob/Stream.ob

@@ -55,7 +55,7 @@ BEGIN
     RETURN result
 END getChar;
 
-PROCEDURE peekStr*(self: Type; s: ARRAY OF CHAR): BOOLEAN;
+PROCEDURE peekStr*(self: Type; s: STRING): BOOLEAN;
 VAR
     result: BOOLEAN;
     i: INTEGER;