*** empty log message ***

ase/stx/parser.c

@@ -1,5 +1,5 @@
 /*
- * $Id: parser.c,v 1.25 2005-06-11 18:01:25 bacon Exp $
+ * $Id: parser.c,v 1.26 2005-06-12 12:33:31 bacon Exp $
  */
 
 #include <xp/stx/parser.h>
@@ -12,6 +12,7 @@ static int __parse_method (
 static int __parse_message_pattern (xp_stx_parser_t* parser);
 static int __parse_temporaries (xp_stx_parser_t* parser);
 static int __parse_statements (xp_stx_parser_t* parser);
+static int __parse_statements_2 (xp_stx_parser_t* parser);
 static int __parse_expression (xp_stx_parser_t* parser);
 
 static int __get_token (xp_stx_parser_t* parser);
@@ -73,13 +74,40 @@ void xp_stx_parser_close (xp_stx_parser_t* parser)
 		} \
 	} while (0)
 	
+const xp_char_t* xp_stx_parser_error_string (xp_stx_parser_t* parser)
+{
+	static const xp_char_t* msg[] =
+	{
+		XP_TEXT("no error"),
+
+		XP_TEXT("input fucntion not ready"),
+		XP_TEXT("input function error"),
+		XP_TEXT("out of memory"),
+
+		XP_TEXT("invalid character"),
+		XP_TEXT("incomplete character literal"),
+		XP_TEXT("incomplete string literal"),
+
+		XP_TEXT("message selector"),
+		XP_TEXT("temporary list not closed"),
+		XP_TEXT("invalid argument name"),
+		XP_TEXT("invalid expression start"),
+		XP_TEXT("no period at end of statement")
+	};
+
+	if (parser->error_code >= 0 && 
+	    parser->error_code < xp_countof(msg)) return msg[parser->error_code];
+
+	return XP_TEXT("unknown error");
+}
+
 int xp_stx_parser_parse_method (
 	xp_stx_parser_t* parser, xp_word_t method_class, void* input)
 {
 	int n;
 
 	if (parser->input_func == XP_NULL) { 
-		parser->error_code = XP_STX_PARSER_ERROR_INVALID;
+		parser->error_code = XP_STX_PARSER_ERROR_INPUT_FUNC;
 		return -1;
 	}
 
@@ -125,10 +153,26 @@ xp_printf (XP_TEXT("unary pattern - %s\n"), parser->token.buffer);
 	else if (parser->token.type == XP_STX_TOKEN_BINARY) { 
 		/* binary pattern */
 xp_printf (XP_TEXT("binary pattern - %s\n"), parser->token.buffer);
+		GET_TOKEN (parser);
+		if (parser->token.type != XP_STX_TOKEN_IDENT) {
+			parser->error_code = XP_STX_PARSER_ERROR_ARGUMENT;
+			return -1;
+		}
+
+		GET_TOKEN (parser);
 	}
 	else if (parser->token.type == XP_STX_TOKEN_KEYWORD) { 
 		/* keyword pattern */
 xp_printf (XP_TEXT("keyword pattern - %s\n"), parser->token.buffer);
+
+		do {
+			GET_TOKEN (parser);
+			if (parser->token.type != XP_STX_TOKEN_IDENT) {
+				parser->error_code = XP_STX_PARSER_ERROR_ARGUMENT;
+				return -1;
+			}
+			GET_TOKEN (parser);
+		} while (parser->token.type == XP_STX_TOKEN_KEYWORD);
 	}
 	else {
 		parser->error_code = XP_STX_PARSER_ERROR_MESSAGE_SELECTOR;
@@ -167,23 +211,37 @@ xp_printf (XP_TEXT("temporary: %s\n"), parser->token.buffer);
 static int __parse_statements (xp_stx_parser_t* parser)
 {
 	/*
-	 * <statements> ::=
+	 * <statements> ::= (TODO: this definition seems to be wrong)
 	 * 	(<return statement> ['.'] ) |
 	 * 	(<expression> ['.' [<statements>]])
 	 * <return statement> ::= returnOperator  <expression>
 	 * returnOperator ::= '^'
 	 */
 
+	if (__parse_statements_2 (parser) == -1) return -1;
+	if (parser->token.type != XP_STX_TOKEN_END) {
+		parser->error_code = XP_STX_PARSER_ERROR_NO_PERIOD;
+		return -1;
+	}
+	return 0;
+}
+
+static int __parse_statements_2 (xp_stx_parser_t* parser)
+{
+	if (parser->token.type == XP_STX_TOKEN_END) return 0;
+
 	if (parser->token.type == XP_STX_TOKEN_RETURN) {
-		if (__parse_expresssion (parser) == -1) return -1;
+		GET_TOKEN (parser);
+		if (__parse_expression (parser) == -1) return -1;
 		/* TODO */
 	}
 	else {
-		if (__parse_expresssion (parser) == -1) return -1;
+		if (__parse_expression (parser) == -1) return -1;
+	}
+
 	if (parser->token.type == XP_STX_TOKEN_PERIOD) {
 		GET_TOKEN (parser);
-			if (__parse_statements (parser) == -1) return -1;
+		if (__parse_statements_2 (parser) == -1) return -1;
-		}
 	}
 
 	return 0;
@@ -191,9 +249,40 @@ static int __parse_statements (xp_stx_parser_t* parser)
 
 static int __parse_expression (xp_stx_parser_t* parser)
 {
+	/*
+	 * <expression> ::= <assignment> | <basic expression>
+	 * <assignment> ::= <assignment target> assignmentOperator  <expression>
+	 * <basic expression> ::= <primary> [<messages> <cascaded messages>]
+	 * <assignment target> := identifier
+	 * assignmentOperator ::=  ':='
+	 * <primary> ::=
+	 * 	identifier | <literal> | 
+	 * 	<block constructor> | ( '('<expression>')' )
+	 */
+
+	if (parser->token.type == XP_STX_TOKEN_IDENT) {
+xp_printf (XP_TEXT("identifier......[%s]\n"), parser->token.buffer);
+		GET_TOKEN (parser);
+	}
+	else if (parser->token.type == XP_STX_TOKEN_CHARLIT ||
+	         parser->token.type == XP_STX_TOKEN_STRLIT ||
+	         parser->token.type == XP_STX_TOKEN_NUMLIT) {
+		/* more literals - array symbol #xxx #(1 2 3) */
+xp_printf (XP_TEXT("literal......[%s]\n"), parser->token.buffer);
+		GET_TOKEN (parser);
+	}
+	else if (parser->token.type == XP_STX_TOKEN_LBRACKET) {
+	}
+	else if (parser->token.type == XP_STX_TOKEN_LPAREN) {
+	}
+	else {
+		parser->error_code = XP_STX_PARSER_ERROR_EXPRESSION_START;
 		return -1;
 	}
 
+	return 0;
+}
+
 static inline xp_bool_t __is_binary_char (xp_cint_t c)
 {
 	/*
@@ -274,6 +363,16 @@ static int __get_token (xp_stx_parser_t* parser)
 		ADD_TOKEN_CHAR(parser, c);
 		GET_CHAR (parser);
 	}
+	else if (c == XP_CHAR('(')) {
+		parser->token.type = XP_STX_TOKEN_LPAREN;
+		ADD_TOKEN_CHAR(parser, c);
+		GET_CHAR (parser);
+	}
+	else if (c == XP_CHAR(')')) {
+		parser->token.type = XP_STX_TOKEN_RPAREN;
+		ADD_TOKEN_CHAR(parser, c);
+		GET_CHAR (parser);
+	}
 	else if (c == XP_CHAR('.')) {
 		parser->token.type = XP_STX_TOKEN_PERIOD;
 		ADD_TOKEN_CHAR(parser, c);
@@ -287,6 +386,7 @@ static int __get_token (xp_stx_parser_t* parser)
 		return -1;
 	}
 
+xp_printf (XP_TEXT("TOKEN: [%s]\n"), parser->token.buffer);
 	return 0;
 }
 

ase/stx/parser.h

@@ -1,5 +1,5 @@
 /*
- * $Id: parser.h,v 1.15 2005-06-11 18:01:25 bacon Exp $
+ * $Id: parser.h,v 1.16 2005-06-12 12:33:31 bacon Exp $
  */
 
 #ifndef _XP_STX_PARSER_H_
@@ -13,9 +13,9 @@ enum
 	XP_STX_PARSER_ERROR_NONE,
 
 	/* system errors */
-	XP_STX_PARSER_ERROR_INVALID,
+	XP_STX_PARSER_ERROR_INPUT_FUNC,
-	XP_STX_PARSER_ERROR_MEMORY,
 	XP_STX_PARSER_ERROR_INPUT,
+	XP_STX_PARSER_ERROR_MEMORY,
 
 	/* lexical errors */
 	XP_STX_PARSER_ERROR_CHAR,
@@ -24,7 +24,10 @@ enum
 
 	/* syntatic error */
 	XP_STX_PARSER_ERROR_MESSAGE_SELECTOR,
-	XP_STX_PARSER_ERROR_TEMPORARIES_NOT_CLOSED
+	XP_STX_PARSER_ERROR_TEMPORARIES_NOT_CLOSED,
+	XP_STX_PARSER_ERROR_ARGUMENT,
+	XP_STX_PARSER_ERROR_EXPRESSION_START,
+	XP_STX_PARSER_ERROR_NO_PERIOD
 };
 
 enum

ase/stx/token.h

@@ -1,5 +1,5 @@
 /*
- * $Id: token.h,v 1.10 2005-06-11 18:01:25 bacon Exp $
+ * $Id: token.h,v 1.11 2005-06-12 12:33:31 bacon Exp $
  */
 
 #ifndef _XP_STX_TOKEN_H_
@@ -22,6 +22,8 @@ enum
 	XP_STX_TOKEN_RETURN,
 	XP_STX_TOKEN_LBRACKET,
 	XP_STX_TOKEN_RBRACKET,
+	XP_STX_TOKEN_LPAREN,
+	XP_STX_TOKEN_RPAREN,
 	XP_STX_TOKEN_PERIOD
 };
 

ase/test/stx/parser.c

@@ -126,7 +126,8 @@ int xp_main (int argc, xp_char_t* argv[])
 		parser.input_func = stdio_func;
 		if (xp_stx_parser_parse_method (&parser, 0, 
 			(void*)XP_TEXT("test.st")) == -1) {
-			xp_printf (XP_TEXT("parser error <%d>\n"), parser.error_code);
+			xp_printf (XP_TEXT("parser error <%s>\n"), 
+			xp_stx_parser_error_string (&parser));
 		}
 	}
 

ase/test/stx/test.st

@@ -1,8 +1,11 @@
-isNil "test if self is nil"
+"isNil" "test if self is nil"
+perform: method with: x with: y
 
 	| a b c d e f g |
-	'this is very bad''this is'
+	'this is very bad''this is'.
-	$a $b
+
-	^true $
+	$a. 
+	$b.
+	^true.
 	a := b.
 	' this is bad