X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fp-exp.y;h=b4d4739d69c9b280fe31d16dc1a5c957a3a981eb;hb=a3982d4858ac407c7e879a57762bc4130d54d4b8;hp=d52747b072eda4d5860b868658a35bc4af836bee;hpb=ef9441350c3b5a17b2791f701b73d15ebdc91b58;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index d52747b072..b4d4739d69 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -205,7 +205,7 @@ static int search_field;
 
 /* Object pascal */
 %token THIS
-%token <lval> TRUE FALSE
+%token <lval> TRUEKEYWORD FALSEKEYWORD
 
 %left ','
 %left ABOVE_COMMA
@@ -293,7 +293,7 @@ exp	:	exp '.' { search_field = 1; }
 			    { while (TYPE_CODE (current_type) == TYPE_CODE_PTR)
 				current_type = TYPE_TARGET_TYPE (current_type);
 			      current_type = lookup_struct_elt_type (
-				current_type, $4.ptr, false); };
+				current_type, $4.ptr, 0); };
 			 } ; 
 exp	:	exp '['
 			/* We need to save the current_type value */
@@ -342,7 +342,15 @@ arglist	:
 	;
 
 exp	:	type '(' exp ')' %prec UNARY
-			{ write_exp_elt_opcode (UNOP_CAST);
+			{ if (current_type)
+			    {
+			      /* Allow automatic dereference of classes.  */
+			      if ((TYPE_CODE (current_type) == TYPE_CODE_PTR)
+				  && (TYPE_CODE (TYPE_TARGET_TYPE (current_type)) == TYPE_CODE_CLASS)
+				  && (TYPE_CODE ($1) == TYPE_CODE_CLASS))
+				write_exp_elt_opcode (UNOP_IND);
+			    }
+			  write_exp_elt_opcode (UNOP_CAST);
 			  write_exp_elt_type ($1);
 			  write_exp_elt_opcode (UNOP_CAST); 
 			  current_type = $1; }
@@ -426,13 +434,13 @@ exp	:	exp ASSIGN exp
 			{ write_exp_elt_opcode (BINOP_ASSIGN); }
 	;
 
-exp	:	TRUE
+exp	:	TRUEKEYWORD
 			{ write_exp_elt_opcode (OP_BOOL);
 			  write_exp_elt_longcst ((LONGEST) $1);
 			  write_exp_elt_opcode (OP_BOOL); }
 	;
 
-exp	:	FALSE
+exp	:	FALSEKEYWORD
 			{ write_exp_elt_opcode (OP_BOOL);
 			  write_exp_elt_longcst ((LONGEST) $1);
 			  write_exp_elt_opcode (OP_BOOL); }
@@ -504,8 +512,28 @@ exp	:	STRING
 
 /* Object pascal  */
 exp	:	THIS
-			{ write_exp_elt_opcode (OP_THIS);
-			  write_exp_elt_opcode (OP_THIS); }
+			{ 
+			  struct value * this_val;
+			  struct type * this_type;
+			  write_exp_elt_opcode (OP_THIS);
+			  write_exp_elt_opcode (OP_THIS); 
+			  /* we need type of this */
+			  this_val = value_of_this (0); 
+			  if (this_val)
+			    this_type = this_val->type;
+			  else
+			    this_type = NULL;
+			  if (this_type)
+			    {
+			      if (TYPE_CODE (this_type) == TYPE_CODE_PTR)
+				{
+				  this_type = TYPE_TARGET_TYPE (this_type);
+				  write_exp_elt_opcode (UNOP_IND);
+				}
+			    }
+		
+			  current_type = this_type;
+			}
 	;
 
 /* end of object pascal.  */
@@ -649,7 +677,7 @@ variable:	name_not_typename
 			      if (this_type)
 				current_type = lookup_struct_elt_type (
 				  this_type,
-				  $1.stoken.ptr, false);
+				  copy_name ($1.stoken), 0);
 			      else
 				current_type = NULL; 
 			    }
@@ -693,7 +721,9 @@ type	:	ptype
 	;
 
 typebase  /* Implements (approximately): (type-qualifier)* type-specifier */
-	:	TYPENAME
+	:	'^' typebase
+			{ $$ = lookup_pointer_type ($2); }
+	|	TYPENAME
 			{ $$ = $1.type; }
 	|	STRUCT name
 			{ $$ = lookup_struct (copy_name ($2),
@@ -1349,14 +1379,14 @@ yylex ()
       if (STREQ (uptokstart, "FALSE"))
 	{
           yylval.lval = 0;
-          return FALSE;
+          return FALSEKEYWORD;
         }
       break;
     case 4:
       if (STREQ (uptokstart, "TRUE"))
 	{
           yylval.lval = 1;
-  	  return TRUE;
+  	  return TRUEKEYWORD;
         }
       if (STREQ (uptokstart, "SELF"))
         {