shithub: pprolog

Info  •  Files  •  Log  •  Branches

Parse terms in parenthesis correctly

--- a/example.pl

+++ b/example.pl

@@ -2,6 +2,11 @@

 math(A,B,C,D) :- D is A + B + C * A.

+parentest :-

+	1 + 2 * 3 + 4.

+parentest :-

+	(0 * (1 + 2) * 3) * 3 + 4.

+

 true.

 likes(bob, ice).

--- a/parser.c

+++ b/parser.c

@@ -171,6 +171,11 @@

 	case CurlyBracketLeftTok:

 		result = curlybracketterm();

 		break;

+	case ParenLeftTok:

+		match(ParenLeftTok);

+		result = fullterm(ParenRightTok, nil, nil);

+		match(ParenRightTok);

+		break;

 	default:

 		print("Cant parse term of token type %d\n", lookahead.tag);

 		syntaxerror("term");

@@ -245,7 +250,7 @@

 	for(i = 0, t = list; i < length; i++){

 		Operator *op = getoperator(t->text);

-		if(op){

+		if(op && t->tag == AtomTok){

 			infos[i].type = op->type;

 			infos[i].level = op->level;

 		}else{