diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f2c16ec..6452232 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -787,7 +787,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
 	charset.c cleanups.c cli-out.c coffread.c coff-pe-read.c \
 	complaints.c completer.c continuations.c corefile.c corelow.c \
 	cp-abi.c cp-support.c cp-namespace.c cp-valprint.c \
-	d-lang.c d-support.c d-valprint.c \
+	d-exp.y d-lang.c d-support.c d-valprint.c \
 	cp-name-parser.y \
 	dbxread.c demangle.c dictionary.c disasm.c doublest.c dummy-frame.c \
 	dwarf2expr.c dwarf2loc.c dwarf2read.c dwarf2-frame.c \
@@ -1041,12 +1041,12 @@ YYFILES = c-exp.c \
 	ada-lex.c \
 	ada-exp.c \
 	jv-exp.c \
-	f-exp.c go-exp.c m2-exp.c p-exp.c
+	d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c
 YYOBJ = c-exp.o \
 	cp-name-parser.o \
 	ada-exp.o \
 	jv-exp.o \
-	f-exp.o go-exp.o m2-exp.o p-exp.o
+	d-exp.o f-exp.o go-exp.o m2-exp.o p-exp.o
 
 # Things which need to be built when making a distribution.
 
@@ -1401,7 +1401,7 @@ local-maintainer-clean:
 		cp-name-parser.c \
 		ada-lex.c ada-exp.c \
 		jv-exp.tab \
-		f-exp.c go-exp.c m2-exp.c p-exp.c
+		d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c
 	rm -f TAGS $(INFOFILES)
 	rm -f $(YYFILES)
 	rm -f nm.h config.status
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
new file mode 100644
index 0000000..ba7f584
--- /dev/null
+++ b/gdb/d-exp.y
@@ -0,0 +1,1636 @@
+/* YACC parser for D expressions, for GDB.
+
+   Copyright (C) 2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* This file is derived from c-exp.y, jv-exp.y.  */
+
+/* Parse a D expression from text in a string,
+   and return the result as a struct expression pointer.
+   That structure contains arithmetic operations in reverse polish,
+   with constants represented by operations that are followed by special data.
+   See expression.h for the details of the format.
+   What is important here is that it can be built up sequentially
+   during the process of parsing; the lower levels of the tree always
+   come first in the result.
+
+   Note that malloc's and realloc's in this file are transformed to
+   xmalloc and xrealloc respectively by the same sed command in the
+   makefile that remaps any other malloc/realloc inserted by the parser
+   generator.  Doing this with #defines and trying to control the interaction
+   with include files (<malloc.h> and <stdlib.h> for example) just became
+   too messy, particularly when such includes can be inserted at random
+   times by the parser generator.  */
+
+%{
+
+#include "defs.h"
+#include <string.h>
+#include <ctype.h>
+#include "expression.h"
+#include "value.h"
+#include "parser-defs.h"
+#include "language.h"
+#include "c-lang.h"
+#include "d-lang.h"
+#include "bfd.h" /* Required by objfiles.h.  */
+#include "symfile.h" /* Required by objfiles.h.  */
+#include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
+#include "charset.h"
+#include "block.h"
+
+#define parse_type(ps) builtin_type (parse_gdbarch (ps))
+#define parse_d_type(ps) builtin_d_type (parse_gdbarch (ps))
+
+/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
+   as well as gratuitiously global symbol names, so we can have multiple
+   yacc generated parsers in gdb.  Note that these are only the variables
+   produced by yacc.  If other parser generators (bison, byacc, etc) produce
+   additional global names that conflict at link time, then those parser
+   generators need to be fixed instead of adding those names to this list.  */
+
+#define	yymaxdepth d_maxdepth
+#define	yyparse	d_parse_internal
+#define	yylex	d_lex
+#define	yyerror	d_error
+#define	yylval	d_lval
+#define	yychar	d_char
+#define	yydebug	d_debug
+#define	yypact	d_pact
+#define	yyr1	d_r1
+#define	yyr2	d_r2
+#define	yydef	d_def
+#define	yychk	d_chk
+#define	yypgo	d_pgo
+#define	yyact	d_act
+#define	yyexca	d_exca
+#define	yyerrflag d_errflag
+#define	yynerrs	d_nerrs
+#define	yyps	d_ps
+#define	yypv	d_pv
+#define	yys	d_s
+#define	yy_yys	d_yys
+#define	yystate	d_state
+#define	yytmp	d_tmp
+#define	yyv	d_v
+#define	yy_yyv	d_yyv
+#define	yyval	d_val
+#define	yylloc	d_lloc
+#define	yyreds	d_reds	/* With YYDEBUG defined */
+#define	yytoks	d_toks	/* With YYDEBUG defined */
+#define	yyname	d_name	/* With YYDEBUG defined */
+#define	yyrule	d_rule	/* With YYDEBUG defined */
+#define	yylhs	d_yylhs
+#define	yylen	d_yylen
+#define	yydefre	d_yydefred
+#define	yydgoto	d_yydgoto
+#define	yysindex d_yysindex
+#define	yyrindex d_yyrindex
+#define	yygindex d_yygindex
+#define	yytable	d_yytable
+#define	yycheck	d_yycheck
+#define	yyss	d_yyss
+#define	yysslim	d_yysslim
+#define	yyssp	d_yyssp
+#define	yystacksize d_yystacksize
+#define	yyvs	d_yyvs
+#define	yyvsp	d_yyvsp
+
+#ifndef YYDEBUG
+#define YYDEBUG 1	/* Default to yydebug support */
+#endif
+
+#define YYFPRINTF parser_fprintf
+
+/* The state of the parser, used internally when we are parsing the
+   expression.  */
+
+static struct parser_state *pstate = NULL;
+
+int yyparse (void);
+
+static int yylex (void);
+
+void yyerror (char *);
+
+%}
+
+/* Although the yacc "value" of an expression is not used,
+   since the result is stored in the structure being created,
+   other node types do have values.  */
+
+%union
+  {
+    struct {
+      LONGEST val;
+      struct type *type;
+    } typed_val_int;
+    struct {
+      DOUBLEST dval;
+      struct type *type;
+    } typed_val_float;
+    struct symbol *sym;
+    struct type *tval;
+    struct typed_stoken tsval;
+    struct stoken sval;
+    struct ttype tsym;
+    struct symtoken ssym;
+    int ival;
+    struct block *bval;
+    enum exp_opcode opcode;
+    struct stoken_vector svec;
+  }
+
+%{
+/* YYSTYPE gets defined by %union */
+static int parse_number (struct parser_state *, const char *,
+			 int, int, YYSTYPE *);
+
+static void push_expression_name (struct parser_state *, struct stoken);
+%}
+
+%token <sval> IDENTIFIER
+%token <tsym> TYPENAME
+%token <voidval> COMPLETE
+
+/* A NAME_OR_INT is a symbol which is not known in the symbol table,
+   but which would parse as a valid number in the current input radix.
+   E.g. "c" when input_radix==16.  Depending on the parse, it will be
+   turned into a name or into a number.  */
+
+%token <sval> NAME_OR_INT
+
+%token <typed_val_int> INTEGER_LITERAL
+%token <typed_val_float> FLOAT_LITERAL
+%token <tsval> CHARACTER_LITERAL
+%token <tsval> STRING_LITERAL
+
+%type <svec> StringExp
+%type <tval> BasicType TypeExp
+%type <sval> IdentifierExp
+%type <ival> ArrayLiteral
+
+%token ENTRY
+%token ERROR
+
+/* Keywords that have a constant value.  */
+%token TRUE_KEYWORD FALSE_KEYWORD NULL_KEYWORD
+/* Class 'super' accessor.  */
+%token SUPER_KEYWORD
+/* Properties.  */
+%token CAST_KEYWORD SIZEOF_KEYWORD
+%token TYPEOF_KEYWORD TYPEID_KEYWORD
+%token INIT_KEYWORD
+/* Comparison keywords.  */
+/* Type storage classes.  */
+%token IMMUTABLE_KEYWORD CONST_KEYWORD SHARED_KEYWORD
+/* Non-scalar type keywords.  */
+%token STRUCT_KEYWORD UNION_KEYWORD
+%token CLASS_KEYWORD INTERFACE_KEYWORD
+%token ENUM_KEYWORD TEMPLATE_KEYWORD
+%token DELEGATE_KEYWORD FUNCTION_KEYWORD
+
+%token VARIABLE
+
+%token <opcode> ASSIGN_MODIFY
+
+%left ','
+%right '=' ASSIGN_MODIFY
+%right '?'
+%left OROR
+%left ANDAND
+%left '|'
+%left '^'
+%left '&'
+%left EQUAL NOTEQUAL '<' '>' LEQ GEQ
+%right LSH RSH
+%left '+' '-' NOTNOT
+%left '*' '/' '%'
+%right HATHAT
+%left IDENTITY NOTIDENTITY
+%right INCREMENT DECREMENT
+%right '.' '[' '('
+%token DOTDOT
+
+
+%%
+
+start   :
+	Expression
+|	TypeExp
+|	VARIABLE
+;
+
+/* Expressions, including the comma operator.  */
+
+Expression:
+	CommaExpression
+;
+
+CommaExpression:
+	AssignExpression
+|	AssignExpression ',' CommaExpression
+		{ write_exp_elt_opcode (pstate, BINOP_COMMA); }
+;
+
+AssignExpression:
+	ConditionalExpression
+|	ConditionalExpression '=' AssignExpression
+		{ write_exp_elt_opcode (pstate, BINOP_ASSIGN); }
+|	ConditionalExpression ASSIGN_MODIFY AssignExpression
+		{ write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
+		  write_exp_elt_opcode (pstate, $2);
+		  write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY); }
+;
+
+ConditionalExpression:
+	OrOrExpression
+|	OrOrExpression '?' Expression ':' ConditionalExpression
+		{ write_exp_elt_opcode (pstate, TERNOP_COND); }
+;
+
+OrOrExpression:
+	AndAndExpression
+|	OrOrExpression OROR AndAndExpression
+		{ write_exp_elt_opcode (pstate, BINOP_LOGICAL_OR); }
+;
+
+AndAndExpression:
+	OrExpression
+|	AndAndExpression ANDAND OrExpression
+		{ write_exp_elt_opcode (pstate, BINOP_LOGICAL_AND); }
+;
+
+OrExpression:
+	XorExpression
+|	OrExpression '|' XorExpression
+		{ write_exp_elt_opcode (pstate, BINOP_BITWISE_IOR); }
+;
+
+XorExpression:
+	AndExpression
+|	XorExpression '^' AndExpression
+		{ write_exp_elt_opcode (pstate, BINOP_BITWISE_XOR); }
+;
+
+AndExpression:
+	CmpExpression
+|	AndExpression '&' CmpExpression
+		{ write_exp_elt_opcode (pstate, BINOP_BITWISE_AND); }
+;
+
+CmpExpression:
+	ShiftExpression
+|	EqualExpression
+|	IdentityExpression
+|	RelExpression
+;
+
+EqualExpression:
+	ShiftExpression EQUAL ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_EQUAL); }
+|	ShiftExpression NOTEQUAL ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
+;
+
+IdentityExpression:
+	ShiftExpression IDENTITY ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_EQUAL); }
+|	ShiftExpression NOTIDENTITY ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
+;
+
+RelExpression:
+	ShiftExpression '<' ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_LESS); }
+|	ShiftExpression LEQ ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_LEQ); }
+|	ShiftExpression '>' ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_GTR); }
+|	ShiftExpression GEQ ShiftExpression
+		{ write_exp_elt_opcode (pstate, BINOP_GEQ); }
+;
+
+ShiftExpression:
+	AddExpression
+|	ShiftExpression LSH AddExpression
+		{ write_exp_elt_opcode (pstate, BINOP_LSH); }
+|	ShiftExpression RSH AddExpression
+		{ write_exp_elt_opcode (pstate, BINOP_RSH); }
+;
+
+AddExpression:
+	MulExpression
+|	AddExpression '+' MulExpression
+		{ write_exp_elt_opcode (pstate, BINOP_ADD); }
+|	AddExpression '-' MulExpression
+		{ write_exp_elt_opcode (pstate, BINOP_SUB); }
+|	AddExpression '~' MulExpression
+		{ write_exp_elt_opcode (pstate, BINOP_CONCAT); }
+;
+
+MulExpression:
+	UnaryExpression
+|	MulExpression '*' UnaryExpression
+		{ write_exp_elt_opcode (pstate, BINOP_MUL); }
+|	MulExpression '/' UnaryExpression
+		{ write_exp_elt_opcode (pstate, BINOP_DIV); }
+|	MulExpression '%' UnaryExpression
+		{ write_exp_elt_opcode (pstate, BINOP_REM); }
+
+UnaryExpression:
+	'&' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_ADDR); }
+|	INCREMENT UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_PREINCREMENT); }
+|	DECREMENT UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_PREDECREMENT); }
+|	'*' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_IND); }
+|	'-' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_NEG); }
+|	'+' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_PLUS); }
+|	'!' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
+|	'~' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_COMPLEMENT); }
+|	CastExpression
+|	PowExpression
+;
+
+CastExpression:
+	CAST_KEYWORD '(' TypeExp ')' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_CAST);
+		  write_exp_elt_type (pstate, $3);
+		  write_exp_elt_opcode (pstate, UNOP_CAST); }
+	/* C style cast is illegal D, but is still recognised in
+	   the grammar, so we keep this around for convenience.  */
+|	'(' TypeExp ')' UnaryExpression
+		{ write_exp_elt_opcode (pstate, UNOP_CAST);
+		  write_exp_elt_type (pstate, $2);
+		  write_exp_elt_opcode (pstate, UNOP_CAST); }
+;
+
+PowExpression:
+	PostfixExpression
+|	PostfixExpression HATHAT UnaryExpression
+		{ write_exp_elt_opcode (pstate, BINOP_EXP); }
+;
+
+PostfixExpression:
+	PrimaryExpression
+|	PostfixExpression INCREMENT
+		{ write_exp_elt_opcode (pstate, UNOP_POSTINCREMENT); }
+|	PostfixExpression DECREMENT
+		{ write_exp_elt_opcode (pstate, UNOP_POSTDECREMENT); }
+|	CallExpression
+|	IndexExpression
+|	SliceExpression
+;
+
+ArgumentList:
+	AssignExpression
+		{ arglist_len = 1; }
+|	ArgumentList ',' AssignExpression
+		{ arglist_len++; }
+;
+
+ArgumentList_opt:
+	/* EMPTY */
+		{ arglist_len = 0; }
+|	ArgumentList
+;
+
+CallExpression:
+	PostfixExpression '('
+		{ start_arglist (); }
+	ArgumentList_opt ')'
+		{ write_exp_elt_opcode (pstate, OP_FUNCALL);
+		  write_exp_elt_longcst (pstate, (LONGEST) end_arglist ());
+		  write_exp_elt_opcode (pstate, OP_FUNCALL); }
+;
+
+IndexExpression:
+	PostfixExpression '[' ArgumentList ']'
+		{ if (arglist_len > 0)
+		    {
+		      write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT);
+		      write_exp_elt_longcst (pstate, (LONGEST) arglist_len);
+		      write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT);
+		    }
+		  else
+		    write_exp_elt_opcode (pstate, BINOP_SUBSCRIPT);
+		}
+;
+
+SliceExpression:
+	PostfixExpression '[' ']'
+		{ /* Do nothing.  */ }
+|	PostfixExpression '[' AssignExpression DOTDOT AssignExpression ']'
+		{ write_exp_elt_opcode (pstate, TERNOP_SLICE); }
+;
+
+PrimaryExpression:
+	'(' Expression ')'
+		{ /* Do nothing.  */ }
+|	IdentifierExp
+		{ push_expression_name (pstate, $1); }
+|	IdentifierExp '.' COMPLETE
+		{ struct stoken s;
+		  s.ptr = "";
+		  s.length = 0;
+		  push_expression_name (pstate, $1);
+		  mark_struct_expression (pstate);
+		  write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+		  write_exp_string (pstate, s);
+		  write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+|	IdentifierExp '.' IDENTIFIER COMPLETE
+		{ push_expression_name (pstate, $1);
+		  mark_struct_expression (pstate);
+		  write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+		  write_exp_string (pstate, $3);
+		  write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+|	NAME_OR_INT
+		{ YYSTYPE val;
+                  parse_number (pstate, $1.ptr, $1.length, 0, &val);
+		  write_exp_elt_opcode (pstate, OP_LONG);
+		  write_exp_elt_type (pstate, val.typed_val_int.type);
+		  write_exp_elt_longcst (pstate,
+					 (LONGEST) val.typed_val_int.val);
+		  write_exp_elt_opcode (pstate, OP_LONG); }
+|	NULL_KEYWORD
+		{ struct type *type = parse_d_type (pstate)->builtin_void;
+		  type = lookup_pointer_type (type);
+		  write_exp_elt_opcode (pstate, OP_LONG);
+		  write_exp_elt_type (pstate, type);
+		  write_exp_elt_longcst (pstate, (LONGEST) 0);
+		  write_exp_elt_opcode (pstate, OP_LONG); }
+|	TRUE_KEYWORD
+		{ write_exp_elt_opcode (pstate, OP_BOOL);
+		  write_exp_elt_longcst (pstate, (LONGEST) 1);
+		  write_exp_elt_opcode (pstate, OP_BOOL); }
+|	FALSE_KEYWORD
+		{ write_exp_elt_opcode (pstate, OP_BOOL);
+		  write_exp_elt_longcst (pstate, (LONGEST) 0);
+		  write_exp_elt_opcode (pstate, OP_BOOL); }
+|	INTEGER_LITERAL
+		{ write_exp_elt_opcode (pstate, OP_LONG);
+		  write_exp_elt_type (pstate, $1.type);
+		  write_exp_elt_longcst (pstate, (LONGEST)($1.val));
+		  write_exp_elt_opcode (pstate, OP_LONG); }
+|	FLOAT_LITERAL
+		{ write_exp_elt_opcode (pstate, OP_DOUBLE);
+		  write_exp_elt_type (pstate, $1.type);
+		  write_exp_elt_dblcst (pstate, $1.dval);
+		  write_exp_elt_opcode (pstate, OP_DOUBLE); }
+|	CHARACTER_LITERAL
+		{ struct stoken_vector vec;
+		  vec.len = 1;
+		  vec.tokens = &$1;
+		  write_exp_string_vector (pstate, $1.type, &vec); }
+|	StringExp
+		{ int i;
+		  write_exp_string_vector (pstate, 0, &$1);
+		  for (i = 0; i < $1.len; ++i)
+		    free ($1.tokens[i].ptr);
+		  free ($1.tokens); }
+|	ArrayLiteral
+		{ write_exp_elt_opcode (pstate, OP_ARRAY);
+		  write_exp_elt_longcst (pstate, (LONGEST) 0);
+		  write_exp_elt_longcst (pstate, (LONGEST) $1 - 1);
+		  write_exp_elt_opcode (pstate, OP_ARRAY); }
+;
+
+ArrayLiteral:
+	'[' ArgumentList_opt ']'
+		{ $$ = arglist_len; }
+;
+
+IdentifierExp:
+	IDENTIFIER
+|	IdentifierExp '.' IDENTIFIER
+		{ $$.length = $1.length + $3.length + 1;
+		  if ($1.ptr + $1.length + 1 == $3.ptr
+		      && $1.ptr[$1.length] == '.')
+		    $$.ptr = $1.ptr;  /* Optimization.  */
+		  else
+		    {
+		      char *buf = malloc ($$.length + 1);
+		      make_cleanup (free, buf);
+		      sprintf (buf, "%.*s.%.*s",
+		               $1.length, $1.ptr, $3.length, $3.ptr);
+		      $$.ptr = buf;
+		    }
+		}
+;
+
+StringExp:
+	STRING_LITERAL
+		{ /* We copy the string here, and not in the
+		     lexer, to guarantee that we do not leak a
+		     string.  Note that we follow the
+		     NUL-termination convention of the
+		     lexer.  */
+		  struct typed_stoken *vec = XNEW (struct typed_stoken);
+		  $$.len = 1;
+		  $$.tokens = vec;
+
+		  vec->type = $1.type;
+		  vec->length = $1.length;
+		  vec->ptr = malloc ($1.length + 1);
+		  memcpy (vec->ptr, $1.ptr, $1.length + 1);
+		}
+|	StringExp STRING_LITERAL
+		{ /* Note that we NUL-terminate here, but just
+		     for convenience.  */
+		  char *p;
+		  ++$$.len;
+		  $$.tokens = realloc ($$.tokens,
+				       $$.len * sizeof (struct typed_stoken));
+
+		  p = malloc ($2.length + 1);
+		  memcpy (p, $2.ptr, $2.length + 1);
+
+		  $$.tokens[$$.len - 1].type = $2.type;
+		  $$.tokens[$$.len - 1].length = $2.length;
+		  $$.tokens[$$.len - 1].ptr = p;
+		}
+;
+
+TypeExp:
+	BasicType
+		{ write_exp_elt_opcode (pstate, OP_TYPE);
+		  write_exp_elt_type (pstate, $1);
+		  write_exp_elt_opcode (pstate, OP_TYPE); }
+|	BasicType BasicType2
+		{ $$ = follow_types ($1);
+		  write_exp_elt_opcode (pstate, OP_TYPE);
+		  write_exp_elt_type (pstate, $$);
+		  write_exp_elt_opcode (pstate, OP_TYPE);
+		}
+;
+
+BasicType2:
+	'*'
+		{ push_type (tp_pointer); }
+|	'*' BasicType2
+		{ push_type (tp_pointer); }
+|	'[' INTEGER_LITERAL ']'
+		{ push_type_int ($2.val);
+		  push_type (tp_array); }
+|	'[' INTEGER_LITERAL ']' BasicType2
+		{ push_type_int ($2.val);
+		  push_type (tp_array); }
+;
+
+BasicType:
+	TYPENAME
+		{ $$ = $1.type; }
+|	CLASS_KEYWORD IdentifierExp
+		{ $$ = lookup_struct (copy_name ($2),
+				      expression_context_block); }
+|	CLASS_KEYWORD COMPLETE
+		{ mark_completion_tag (TYPE_CODE_CLASS, "", 0);
+		  $$ = NULL; }
+|	CLASS_KEYWORD IdentifierExp COMPLETE
+		{ mark_completion_tag (TYPE_CODE_CLASS, $2.ptr, $2.length);
+		  $$ = NULL; }
+|	STRUCT_KEYWORD IdentifierExp
+		{ $$ = lookup_struct (copy_name ($2),
+				      expression_context_block); }
+|	STRUCT_KEYWORD COMPLETE
+		{ mark_completion_tag (TYPE_CODE_STRUCT, "", 0);
+		  $$ = NULL; }
+|	STRUCT_KEYWORD IdentifierExp COMPLETE
+		{ mark_completion_tag (TYPE_CODE_STRUCT, $2.ptr, $2.length);
+		  $$ = NULL; }
+|	UNION_KEYWORD IdentifierExp
+		{ $$ = lookup_union (copy_name ($2),
+				     expression_context_block); }
+|	UNION_KEYWORD COMPLETE
+		{ mark_completion_tag (TYPE_CODE_UNION, "", 0);
+		  $$ = NULL; }
+|	UNION_KEYWORD IdentifierExp COMPLETE
+		{ mark_completion_tag (TYPE_CODE_UNION, $2.ptr, $2.length);
+		  $$ = NULL; }
+|	ENUM_KEYWORD IdentifierExp
+		{ $$ = lookup_enum (copy_name ($2),
+				    expression_context_block); }
+|	ENUM_KEYWORD COMPLETE
+		{ mark_completion_tag (TYPE_CODE_ENUM, "", 0);
+		  $$ = NULL; }
+|	ENUM_KEYWORD IdentifierExp COMPLETE
+		{ mark_completion_tag (TYPE_CODE_ENUM, $2.ptr, $2.length);
+		  $$ = NULL; }
+;
+
+%%
+
+/* Take care of parsing a number (anything that starts with a digit).
+   Set yylval and return the token type; update lexptr.
+   LEN is the number of characters in it.  */
+
+/*** Needs some error checking for the float case ***/
+
+static int
+parse_number (struct parser_state *ps, const char *p,
+	      int len, int parsed_float, YYSTYPE *putithere)
+{
+  ULONGEST n = 0;
+  ULONGEST prevn = 0;
+  ULONGEST un;
+
+  int i = 0;
+  int c;
+  int base = input_radix;
+  int unsigned_p = 0;
+  int long_p = 0;
+
+  /* We have found a "L" or "U" suffix.  */
+  int found_suffix = 0;
+
+  ULONGEST high_bit;
+  struct type *signed_type;
+  struct type *unsigned_type;
+
+  if (parsed_float)
+    {
+      const struct builtin_d_type *builtin_d_types;
+      const char *suffix;
+      int suffix_len;
+      char *s, *sp;
+
+      /* Strip out all embedded '_' before passing to parse_float.  */
+      s = (char *) alloca (len + 1);
+      sp = s;
+      while (len-- > 0)
+	{
+	  if (*p != '_')
+	    *sp++ = *p;
+	  p++;
+	}
+      *sp = '\0';
+      len = strlen (s);
+
+      if (! parse_float (s, len, &putithere->typed_val_float.dval, &suffix))
+	return ERROR;
+
+      suffix_len = s + len - suffix;
+
+      if (suffix_len == 0)
+	{
+	  putithere->typed_val_float.type
+	    = parse_d_type (ps)->builtin_double;
+	}
+      else if (suffix_len == 1)
+	{
+	  /* Check suffix for `f', `l', or `i' (float, real, or idouble).  */
+	  if (tolower (*suffix) == 'f')
+	    {
+	      putithere->typed_val_float.type
+		= parse_d_type (ps)->builtin_float;
+	    }
+	  else if (tolower (*suffix) == 'l')
+	    {
+	      putithere->typed_val_float.type
+		= parse_d_type (ps)->builtin_real;
+	    }
+	  else if (tolower (*suffix) == 'i')
+	    {
+	      putithere->typed_val_float.type
+		= parse_d_type (ps)->builtin_idouble;
+	    }
+	  else
+	    return ERROR;
+	}
+      else if (suffix_len == 2)
+	{
+	  /* Check suffix for `fi' or `li' (ifloat or ireal).  */
+	  if (tolower (suffix[0]) == 'f' && tolower (suffix[1] == 'i'))
+	    {
+	      putithere->typed_val_float.type
+		= parse_d_type (ps)->builtin_ifloat;
+	    }
+	  else if (tolower (suffix[0]) == 'l' && tolower (suffix[1] == 'i'))
+	    {
+	      putithere->typed_val_float.type
+		= parse_d_type (ps)->builtin_ireal;
+	    }
+	  else
+	    return ERROR;
+	}
+      else
+	return ERROR;
+
+      return FLOAT_LITERAL;
+    }
+
+  /* Handle base-switching prefixes 0x, 0b, 0 */
+  if (p[0] == '0')
+    switch (p[1])
+      {
+      case 'x':
+      case 'X':
+	if (len >= 3)
+	  {
+	    p += 2;
+	    base = 16;
+	    len -= 2;
+	  }
+	break;
+
+      case 'b':
+      case 'B':
+	if (len >= 3)
+	  {
+	    p += 2;
+	    base = 2;
+	    len -= 2;
+	  }
+	break;
+
+      default:
+	base = 8;
+	break;
+      }
+
+  while (len-- > 0)
+    {
+      c = *p++;
+      if (c == '_')
+	continue;	/* Ignore embedded '_'.  */
+      if (c >= 'A' && c <= 'Z')
+	c += 'a' - 'A';
+      if (c != 'l' && c != 'u')
+	n *= base;
+      if (c >= '0' && c <= '9')
+	{
+	  if (found_suffix)
+	    return ERROR;
+	  n += i = c - '0';
+	}
+      else
+	{
+	  if (base > 10 && c >= 'a' && c <= 'f')
+	    {
+	      if (found_suffix)
+	        return ERROR;
+	      n += i = c - 'a' + 10;
+	    }
+	  else if (c == 'l' && long_p == 0)
+	    {
+	      long_p = 1;
+	      found_suffix = 1;
+	    }
+	  else if (c == 'u' && unsigned_p == 0)
+	    {
+	      unsigned_p = 1;
+	      found_suffix = 1;
+	    }
+	  else
+	    return ERROR;	/* Char not a digit */
+	}
+      if (i >= base)
+	return ERROR;		/* Invalid digit in this base.  */
+      /* Portably test for integer overflow.  */
+      if (c != 'l' && c != 'u')
+	{
+	  ULONGEST n2 = prevn * base;
+	  if ((n2 / base != prevn) || (n2 + i < prevn))
+	    error (_("Numeric constant too large."));
+	}
+      prevn = n;
+    }
+
+  /* An integer constant is an int or a long.  An L suffix forces
+     it to be long.  To figure out whether it fits, we shift it
+     right and see whether anything remains.  Note that we can't
+     shift sizeof (LONGEST) * HOST_CHAR_BIT bits or more in one
+     operation, because many compilers will warn about such a shift
+     (which always produces a zero result).  To deal with the case
+     where it is we just always shift the value more than once,
+     with fewer bits each time.  */
+  un = (ULONGEST) n >> 2;
+  if (long_p == 0 && (un >> 30) == 0)
+    {
+      high_bit = ((ULONGEST) 1) << 31;
+      unsigned_type = parse_d_type (ps)->builtin_uint;
+      signed_type = parse_d_type (ps)->builtin_int;
+    }
+  else
+    {
+      int shift;
+      if (sizeof (ULONGEST) * HOST_CHAR_BIT < 64)
+	/* A long long does not fit in a LONGEST.  */
+	shift = (sizeof (ULONGEST) * HOST_CHAR_BIT - 1);
+      else
+	shift = 63;
+      high_bit = (ULONGEST) 1 << shift;
+      unsigned_type = parse_d_type (ps)->builtin_ulong;
+      signed_type = parse_d_type (ps)->builtin_long;
+    }
+
+  putithere->typed_val_int.val = n;
+
+  /* If the high bit of the worked out type is set then this number
+     has to be unsigned.  */
+  if (unsigned_p || (n & high_bit))
+    putithere->typed_val_int.type = unsigned_type;
+  else
+    putithere->typed_val_int.type = signed_type;
+
+  return INTEGER_LITERAL;
+}
+
+/* Temporary obstack used for holding strings.  */
+static struct obstack tempbuf;
+static int tempbuf_init;
+
+/* Parse a string or character literal from TOKPTR.  The string or
+   character may be wide or unicode.  *OUTPTR is set to just after the
+   end of the literal in the input string.  The resulting token is
+   stored in VALUE.  This returns a token value, either STRING or
+   CHAR, depending on what was parsed.  *HOST_CHARS is set to the
+   number of host characters in the literal.  */
+
+static int
+parse_string_or_char (const char *tokptr, const char **outptr,
+		      struct typed_stoken *value, int *host_chars)
+{
+  int quote;
+
+  /* Build the gdb internal form of the input string in tempbuf.  Note
+     that the buffer is null byte terminated *only* for the
+     convenience of debugging gdb itself and printing the buffer
+     contents when the buffer contains no embedded nulls.  Gdb does
+     not depend upon the buffer being null byte terminated, it uses
+     the length string instead.  This allows gdb to handle C strings
+     (as well as strings in other languages) with embedded null
+     bytes */
+
+  if (!tempbuf_init)
+    tempbuf_init = 1;
+  else
+    obstack_free (&tempbuf, NULL);
+  obstack_init (&tempbuf);
+
+  /* Skip the quote.  */
+  quote = *tokptr;
+  ++tokptr;
+
+  *host_chars = 0;
+
+  while (*tokptr)
+    {
+      char c = *tokptr;
+      if (c == '\\')
+	{
+	   ++tokptr;
+	   *host_chars += c_parse_escape (&tokptr, &tempbuf);
+	}
+      else if (c == quote)
+	break;
+      else
+	{
+	  obstack_1grow (&tempbuf, c);
+	  ++tokptr;
+	  /* FIXME: this does the wrong thing with multi-byte host
+	     characters.  We could use mbrlen here, but that would
+	     make "set host-charset" a bit less useful.  */
+	  ++*host_chars;
+	}
+    }
+
+  if (*tokptr != quote)
+    {
+      if (quote == '"' || quote == '`')
+	error (_("Unterminated string in expression."));
+      else
+	error (_("Unmatched single quote."));
+    }
+  ++tokptr;
+
+  /* FIXME: should instead use own language string_type enum
+     and handle D-specific string suffixes here. */
+  if (quote == '\'')
+    value->type = C_CHAR;
+  else
+    value->type = C_STRING;
+
+  value->ptr = obstack_base (&tempbuf);
+  value->length = obstack_object_size (&tempbuf);
+
+  *outptr = tokptr;
+
+  return quote == '\'' ? CHARACTER_LITERAL : STRING_LITERAL;
+}
+
+struct token
+{
+  char *operator;
+  int token;
+  enum exp_opcode opcode;
+};
+
+static const struct token tokentab3[] =
+  {
+    {"^^=", ASSIGN_MODIFY, BINOP_EXP},
+    {"<<=", ASSIGN_MODIFY, BINOP_LSH},
+    {">>=", ASSIGN_MODIFY, BINOP_RSH},
+  };
+
+static const struct token tokentab2[] =
+  {
+    {"+=", ASSIGN_MODIFY, BINOP_ADD},
+    {"-=", ASSIGN_MODIFY, BINOP_SUB},
+    {"*=", ASSIGN_MODIFY, BINOP_MUL},
+    {"/=", ASSIGN_MODIFY, BINOP_DIV},
+    {"%=", ASSIGN_MODIFY, BINOP_REM},
+    {"|=", ASSIGN_MODIFY, BINOP_BITWISE_IOR},
+    {"&=", ASSIGN_MODIFY, BINOP_BITWISE_AND},
+    {"^=", ASSIGN_MODIFY, BINOP_BITWISE_XOR},
+    {"++", INCREMENT, BINOP_END},
+    {"--", DECREMENT, BINOP_END},
+    {"&&", ANDAND, BINOP_END},
+    {"||", OROR, BINOP_END},
+    {"!!", NOTNOT, BINOP_END},
+    {"^^", HATHAT, BINOP_END},
+    {"<<", LSH, BINOP_END},
+    {">>", RSH, BINOP_END},
+    {"==", EQUAL, BINOP_END},
+    {"!=", NOTEQUAL, BINOP_END},
+    {"<=", LEQ, BINOP_END},
+    {">=", GEQ, BINOP_END},
+    {"..", DOTDOT, BINOP_END},
+  };
+
+/* Identifier-like tokens.  */
+static const struct token ident_tokens[] =
+  {
+    {"is", IDENTITY, BINOP_END},
+    {"!is", NOTIDENTITY, BINOP_END},
+
+    {"cast", CAST_KEYWORD, OP_NULL},
+    {"const", CONST_KEYWORD, OP_NULL},
+    {"immutable", IMMUTABLE_KEYWORD, OP_NULL},
+    {"shared", SHARED_KEYWORD, OP_NULL},
+    {"super", SUPER_KEYWORD, OP_NULL},
+
+    {"null", NULL_KEYWORD, OP_NULL},
+    {"true", TRUE_KEYWORD, OP_NULL},
+    {"false", FALSE_KEYWORD, OP_NULL},
+
+    {"init", INIT_KEYWORD, OP_NULL},
+    {"sizeof", SIZEOF_KEYWORD, OP_NULL},
+    {"typeof", TYPEOF_KEYWORD, OP_NULL},
+    {"typeid", TYPEID_KEYWORD, OP_NULL},
+
+    {"delegate", DELEGATE_KEYWORD, OP_NULL},
+    {"function", FUNCTION_KEYWORD, OP_NULL},
+    {"struct", STRUCT_KEYWORD, OP_NULL},
+    {"union", UNION_KEYWORD, OP_NULL},
+    {"class", CLASS_KEYWORD, OP_NULL},
+    {"interface", INTERFACE_KEYWORD, OP_NULL},
+    {"enum", ENUM_KEYWORD, OP_NULL},
+    {"template", TEMPLATE_KEYWORD, OP_NULL},
+  };
+
+/* If NAME is a type name in this scope, return it.  */
+
+static struct type *
+d_type_from_name (struct stoken name)
+{
+  struct symbol *sym;
+  char *copy = copy_name (name);
+
+  sym = lookup_symbol (copy, expression_context_block,
+		       STRUCT_DOMAIN, NULL);
+  if (sym != NULL)
+    return SYMBOL_TYPE (sym);
+
+  return NULL;
+}
+
+/* If NAME is a module name in this scope, return it.  */
+
+static struct type *
+d_module_from_name (struct stoken name)
+{
+  struct symbol *sym;
+  char *copy = copy_name (name);
+
+  sym = lookup_symbol (copy, expression_context_block,
+		       MODULE_DOMAIN, NULL);
+  if (sym != NULL)
+    return SYMBOL_TYPE (sym);
+
+  return NULL;
+}
+
+/* If NAME is a valid variable name in this scope, push it and return 1.
+   Otherwise, return 0.  */
+
+static int
+push_variable (struct parser_state *ps, struct stoken name)
+{
+  char *copy = copy_name (name);
+  struct field_of_this_result is_a_field_of_this;
+  struct symbol *sym;
+  sym = lookup_symbol (copy, expression_context_block, VAR_DOMAIN,
+                       &is_a_field_of_this);
+  if (sym && SYMBOL_CLASS (sym) != LOC_TYPEDEF)
+    {
+      if (symbol_read_needs_frame (sym))
+        {
+          if (innermost_block == 0 ||
+              contained_in (block_found, innermost_block))
+            innermost_block = block_found;
+        }
+
+      write_exp_elt_opcode (ps, OP_VAR_VALUE);
+      /* We want to use the selected frame, not another more inner frame
+         which happens to be in the same block.  */
+      write_exp_elt_block (ps, NULL);
+      write_exp_elt_sym (ps, sym);
+      write_exp_elt_opcode (ps, OP_VAR_VALUE);
+      return 1;
+    }
+  if (is_a_field_of_this.type != NULL)
+    {
+      /* It hangs off of `this'.  Must not inadvertently convert from a
+         method call to data ref.  */
+      if (innermost_block == 0 ||
+          contained_in (block_found, innermost_block))
+        innermost_block = block_found;
+      write_exp_elt_opcode (ps, OP_THIS);
+      write_exp_elt_opcode (ps, OP_THIS);
+      write_exp_elt_opcode (ps, STRUCTOP_PTR);
+      write_exp_string (ps, name);
+      write_exp_elt_opcode (ps, STRUCTOP_PTR);
+      return 1;
+    }
+  return 0;
+}
+
+/* Assuming a reference expression has been pushed, emit the
+   STRUCTOP_PTR ops to access the field named NAME.  If NAME is a
+   qualified name (has '.'), generate a field access for each part.  */
+
+static void
+push_fieldnames (struct parser_state *ps, struct stoken name)
+{
+  int i;
+  struct stoken token;
+  token.ptr = name.ptr;
+  for (i = 0;  ;  i++)
+    {
+      if (i == name.length || name.ptr[i] == '.')
+        {
+          /* token.ptr is start of current field name.  */
+          token.length = &name.ptr[i] - token.ptr;
+          write_exp_elt_opcode (ps, STRUCTOP_PTR);
+          write_exp_string (ps, token);
+          write_exp_elt_opcode (ps, STRUCTOP_PTR);
+          token.ptr += token.length + 1;
+        }
+      if (i >= name.length)
+        break;
+    }
+}
+
+/* Helper routine for push_expression_name.  Handle a TYPE symbol,
+   where DOT_INDEX is the index of the first '.' if NAME is part of
+   a qualified type.  */
+
+static void
+push_type_name (struct parser_state *ps, struct type *type,
+		struct stoken name, int dot_index)
+{
+  if (dot_index == name.length)
+    {
+      write_exp_elt_opcode (ps, OP_TYPE);
+      write_exp_elt_type (ps, type);
+      write_exp_elt_opcode (ps, OP_TYPE);
+    }
+  else
+    {
+      struct stoken token;
+
+      token.ptr = name.ptr;
+      token.length = dot_index;
+
+      dot_index = 0;
+
+      while (dot_index < name.length && name.ptr[dot_index] != '.')
+	dot_index++;
+      token.ptr = name.ptr;
+      token.length = dot_index;
+
+      write_exp_elt_opcode (ps, OP_SCOPE);
+      write_exp_elt_type (ps, type);
+      write_exp_string (ps, token);
+      write_exp_elt_opcode (ps, OP_SCOPE);
+
+      if (dot_index < name.length)
+	{
+	  dot_index++;
+	  name.ptr += dot_index;
+	  name.length -= dot_index;
+	  push_fieldnames (ps, name);
+	}
+    }
+}
+
+/* Helper routine for push_expression_name.  Like push_type_name,
+   but used when TYPE is a module.  Returns 1 on pushing the symbol.  */
+
+static int
+push_module_name (struct parser_state *ps, struct type *module,
+		  struct stoken name, int dot_index)
+{
+  if (dot_index == name.length)
+    {
+      write_exp_elt_opcode (ps, OP_TYPE);
+      write_exp_elt_type (ps, module);
+      write_exp_elt_opcode (ps, OP_TYPE);
+      return 1;
+    }
+  else
+    {
+      struct symbol *sym;
+      char *copy;
+
+      copy = copy_name (name);
+      sym = lookup_symbol_static (copy, expression_context_block,
+				  VAR_DOMAIN);
+      if (sym != NULL)
+	sym = lookup_symbol_global (copy, expression_context_block,
+				    VAR_DOMAIN);
+
+      if (sym != NULL)
+	{
+	  if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
+	    {
+	      write_exp_elt_opcode (ps, OP_VAR_VALUE);
+	      write_exp_elt_block (ps, NULL);
+	      write_exp_elt_sym (ps, sym);
+	      write_exp_elt_opcode (ps, OP_VAR_VALUE);
+	    }
+	  else
+	    {
+	      write_exp_elt_opcode (ps, OP_TYPE);
+	      write_exp_elt_type (ps, SYMBOL_TYPE (sym));
+	      write_exp_elt_opcode (ps, OP_TYPE);
+	    }
+	  return 1;
+	}
+    }
+
+  return 0;
+}
+
+/* Handle NAME in an expression (or LHS), which could be a
+   variable, type, or module.  */
+
+static void
+push_expression_name (struct parser_state *ps, struct stoken name)
+{
+  struct stoken token;
+  struct type *typ;
+  struct bound_minimal_symbol msymbol;
+  char *copy;
+  int doti;
+
+  /* Handle VAR, which could be local or global.  */
+  if (push_variable (ps, name) != 0)
+    return;
+
+  /* Handle MODULE.  */
+  typ = d_module_from_name (name);
+  if (typ != NULL)
+    {
+      if (push_module_name (ps, typ, name, name.length) != 0)
+	return;
+    }
+
+  /* Handle TYPE.  */
+  typ = d_type_from_name (name);
+  if (typ != NULL)
+    {
+      push_type_name (ps, typ, name, name.length);
+      return;
+    }
+
+  /* Handle VAR.FIELD1..FIELDN.  */
+  for (doti = 0;  doti < name.length;  doti++)
+    {
+      if (name.ptr[doti] == '.')
+	{
+	  token.ptr = name.ptr;
+	  token.length = doti;
+
+	  if (push_variable (ps, token) != 0)
+	    {
+	      token.ptr = name.ptr + doti + 1;
+	      token.length = name.length - doti - 1;
+	      push_fieldnames (ps, token);
+	      return;
+	    }
+	  break;
+	}
+    }
+
+  /* Continue looking if we found a '.' in the name.  */
+  if (doti < name.length)
+    {
+      token.ptr = name.ptr;
+      for (;;)
+	{
+	  token.length = doti;
+
+	  /* Handle PACKAGE.MODULE.  */
+	  typ = d_module_from_name (token);
+	  if (typ != NULL)
+	    {
+	      if (push_module_name (ps, typ, name, doti) != 0)
+		return;
+	    }
+	  /* Handle TYPE.FIELD1..FIELDN.  */
+	  typ = d_type_from_name (token);
+	  if (typ != NULL)
+	    {
+	      push_type_name (ps, typ, name, doti);
+	      return;
+	    }
+
+	  if (doti >= name.length)
+	    break;
+	  doti++;   /* Skip '.'  */
+	  while (doti < name.length && name.ptr[doti] != '.')
+	    doti++;
+	}
+    }
+
+  /* Lookup foreign name in global static symbols.  */
+  copy  = copy_name (name);
+  msymbol = lookup_bound_minimal_symbol (copy);
+  if (msymbol.minsym != NULL)
+    write_exp_msymbol (ps, msymbol);
+  else if (!have_full_symbols () && !have_partial_symbols ())
+    error (_("No symbol table is loaded.  Use the \"file\" command"));
+  else
+    error (_("No symbol \"%s\" in current context."), copy);
+}
+
+/* This is set if a NAME token appeared at the very end of the input
+   string, with no whitespace separating the name from the EOF.  This
+   is used only when parsing to do field name completion.  */
+static int saw_name_at_eof;
+
+/* This is set if the previously-returned token was a structure operator.
+   This is used only when parsing to do field name completion.  */
+static int last_was_structop;
+
+/* Read one token, getting characters through lexptr.  */
+
+static int
+yylex (void)
+{
+  int c;
+  int namelen;
+  unsigned int i;
+  const char *tokstart;
+  int saw_structop = last_was_structop;
+  char *copy;
+
+  last_was_structop = 0;
+
+ retry:
+
+  prev_lexptr = lexptr;
+
+  tokstart = lexptr;
+  /* See if it is a special token of length 3.  */
+  for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
+    if (strncmp (tokstart, tokentab3[i].operator, 3) == 0)
+      {
+	lexptr += 3;
+	yylval.opcode = tokentab3[i].opcode;
+	return tokentab3[i].token;
+      }
+
+  /* See if it is a special token of length 2.  */
+  for (i = 0; i < sizeof tokentab2 / sizeof tokentab2[0]; i++)
+    if (strncmp (tokstart, tokentab2[i].operator, 2) == 0)
+      {
+	lexptr += 2;
+	yylval.opcode = tokentab2[i].opcode;
+	return tokentab2[i].token;
+      }
+
+  switch (c = *tokstart)
+    {
+    case 0:
+      /* If we're parsing for field name completion, and the previous
+	 token allows such completion, return a COMPLETE token.
+	 Otherwise, we were already scanning the original text, and
+	 we're really done.  */
+      if (saw_name_at_eof)
+	{
+	  saw_name_at_eof = 0;
+	  return COMPLETE;
+	}
+      else if (saw_structop)
+	return COMPLETE;
+      else
+        return 0;
+
+    case ' ':
+    case '\t':
+    case '\n':
+      lexptr++;
+      goto retry;
+
+    case '[':
+    case '(':
+      paren_depth++;
+      lexptr++;
+      return c;
+
+    case ']':
+    case ')':
+      if (paren_depth == 0)
+	return 0;
+      paren_depth--;
+      lexptr++;
+      return c;
+
+    case ',':
+      if (comma_terminates && paren_depth == 0)
+	return 0;
+      lexptr++;
+      return c;
+
+    case '.':
+      /* Might be a floating point number.  */
+      if (lexptr[1] < '0' || lexptr[1] > '9')
+	{
+	  if (parse_completion)
+	    last_was_structop = 1;
+	  goto symbol;		/* Nope, must be a symbol.  */
+	}
+      /* FALL THRU into number case.  */
+
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      {
+	/* It's a number.  */
+	int got_dot = 0, got_e = 0, toktype;
+	const char *p = tokstart;
+	int hex = input_radix > 10;
+
+	if (c == '0' && (p[1] == 'x' || p[1] == 'X'))
+	  {
+	    p += 2;
+	    hex = 1;
+	  }
+
+	for (;; ++p)
+	  {
+	    /* Hex exponents start with 'p', because 'e' is a valid hex
+	       digit and thus does not indicate a floating point number
+	       when the radix is hex.  */
+	    if ((!hex && !got_e && tolower (p[0]) == 'e')
+		|| (hex && !got_e && tolower (p[0] == 'p')))
+	      got_dot = got_e = 1;
+	    /* A '.' always indicates a decimal floating point number
+	       regardless of the radix.  If we have a '..' then its the
+	       end of the number and the beginning of a slice.  */
+	    else if (!got_dot && (p[0] == '.' && p[1] != '.'))
+		got_dot = 1;
+	    /* This is the sign of the exponent, not the end of the number.  */
+	    else if (got_e && (tolower (p[-1]) == 'e' || tolower (p[-1]) == 'p')
+		     && (*p == '-' || *p == '+'))
+	      continue;
+	    /* We will take any letters or digits, ignoring any embedded '_'.
+	       parse_number will complain if past the radix, or if L or U are
+	       not final.  */
+	    else if ((*p < '0' || *p > '9') && (*p != '_') &&
+		     ((*p < 'a' || *p > 'z') && (*p < 'A' || *p > 'Z')))
+	      break;
+	  }
+
+	toktype = parse_number (pstate, tokstart, p - tokstart,
+				got_dot|got_e, &yylval);
+	if (toktype == ERROR)
+	  {
+	    char *err_copy = (char *) alloca (p - tokstart + 1);
+
+	    memcpy (err_copy, tokstart, p - tokstart);
+	    err_copy[p - tokstart] = 0;
+	    error (_("Invalid number \"%s\"."), err_copy);
+	  }
+	lexptr = p;
+	return toktype;
+      }
+
+    case '@':
+      {
+	const char *p = &tokstart[1];
+	size_t len = strlen ("entry");
+
+	while (isspace (*p))
+	  p++;
+	if (strncmp (p, "entry", len) == 0 && !isalnum (p[len])
+	    && p[len] != '_')
+	  {
+	    lexptr = &p[len];
+	    return ENTRY;
+	  }
+      }
+      /* FALLTHRU */
+    case '+':
+    case '-':
+    case '*':
+    case '/':
+    case '%':
+    case '|':
+    case '&':
+    case '^':
+    case '~':
+    case '!':
+    case '<':
+    case '>':
+    case '?':
+    case ':':
+    case '=':
+    case '{':
+    case '}':
+    symbol:
+      lexptr++;
+      return c;
+
+    case '\'':
+    case '"':
+    case '`':
+      {
+	int host_len;
+	int result = parse_string_or_char (tokstart, &lexptr, &yylval.tsval,
+					   &host_len);
+	if (result == CHARACTER_LITERAL)
+	  {
+	    if (host_len == 0)
+	      error (_("Empty character constant."));
+	    else if (host_len > 2 && c == '\'')
+	      {
+		++tokstart;
+		namelen = lexptr - tokstart - 1;
+		goto tryname;
+	      }
+	    else if (host_len > 1)
+	      error (_("Invalid character constant."));
+	  }
+	return result;
+      }
+    }
+
+  if (!(c == '_' || c == '$'
+	|| (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')))
+    /* We must have come across a bad character (e.g. ';').  */
+    error (_("Invalid character '%c' in expression"), c);
+
+  /* It's a name.  See how long it is.  */
+  namelen = 0;
+  for (c = tokstart[namelen];
+       (c == '_' || c == '$' || (c >= '0' && c <= '9')
+	|| (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'));)
+    c = tokstart[++namelen];
+
+  /* The token "if" terminates the expression and is NOT
+     removed from the input stream.  */
+  if (namelen == 2 && tokstart[0] == 'i' && tokstart[1] == 'f')
+    return 0;
+
+  /* For the same reason (breakpoint conditions), "thread N"
+     terminates the expression.  "thread" could be an identifier, but
+     an identifier is never followed by a number without intervening
+     punctuation.  "task" is similar.  Handle abbreviations of these,
+     similarly to breakpoint.c:find_condition_and_thread.  */
+  if (namelen >= 1
+      && (strncmp (tokstart, "thread", namelen) == 0
+	  || strncmp (tokstart, "task", namelen) == 0)
+      && (tokstart[namelen] == ' ' || tokstart[namelen] == '\t'))
+    {
+      const char *p = tokstart + namelen + 1;
+
+      while (*p == ' ' || *p == '\t')
+        p++;
+      if (*p >= '0' && *p <= '9')
+        return 0;
+    }
+
+  lexptr += namelen;
+
+ tryname:
+
+  yylval.sval.ptr = tokstart;
+  yylval.sval.length = namelen;
+
+  /* Catch specific keywords.  */
+  copy = copy_name (yylval.sval);
+  for (i = 0; i < sizeof ident_tokens / sizeof ident_tokens[0]; i++)
+    if (strcmp (copy, ident_tokens[i].operator) == 0)
+      {
+	/* It is ok to always set this, even though we don't always
+	   strictly need to.  */
+	yylval.opcode = ident_tokens[i].opcode;
+	return ident_tokens[i].token;
+      }
+
+  if (*tokstart == '$')
+    {
+      write_dollar_variable (pstate, yylval.sval);
+      return VARIABLE;
+    }
+
+  yylval.tsym.type
+    = language_lookup_primitive_type_by_name (parse_language (pstate),
+					      parse_gdbarch (pstate), copy);
+  if (yylval.tsym.type != NULL)
+    return TYPENAME;
+
+  /* Input names that aren't symbols but ARE valid hex numbers,
+     when the input radix permits them, can be names or numbers
+     depending on the parse.  Note we support radixes > 16 here.  */
+  if ((tokstart[0] >= 'a' && tokstart[0] < 'a' + input_radix - 10)
+      || (tokstart[0] >= 'A' && tokstart[0] < 'A' + input_radix - 10))
+    {
+      YYSTYPE newlval;	/* Its value is ignored.  */
+      int hextype = parse_number (pstate, tokstart, namelen, 0, &newlval);
+      if (hextype == INTEGER_LITERAL)
+	return NAME_OR_INT;
+    }
+
+  if (parse_completion && *lexptr == '\0')
+    saw_name_at_eof = 1;
+
+  return IDENTIFIER;
+}
+
+int
+d_parse (struct parser_state *par_state)
+{
+  int result;
+  struct cleanup *back_to;
+
+  /* Setting up the parser state.  */
+  gdb_assert (par_state != NULL);
+  pstate = par_state;
+
+  back_to = make_cleanup (null_cleanup, NULL);
+
+  make_cleanup_restore_integer (&yydebug);
+  make_cleanup_clear_parser_state (&pstate);
+  yydebug = parser_debug;
+
+  /* Initialize some state used by the lexer.  */
+  last_was_structop = 0;
+  saw_name_at_eof = 0;
+
+  result = yyparse ();
+  do_cleanups (back_to);
+  return result;
+}
+
+void
+yyerror (char *msg)
+{
+  if (prev_lexptr)
+    lexptr = prev_lexptr;
+
+  error (_("A %s in expression, near `%s'."), (msg ? msg : "error"), lexptr);
+}
+
diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 434f30a..87d82da 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -96,8 +96,8 @@ static const struct op_print d_op_print_tab[] =
   {"|", BINOP_BITWISE_IOR, PREC_BITWISE_IOR, 0},
   {"^", BINOP_BITWISE_XOR, PREC_BITWISE_XOR, 0},
   {"&", BINOP_BITWISE_AND, PREC_BITWISE_AND, 0},
-  {"==", BINOP_EQUAL, PREC_EQUAL, 0},
-  {"!=", BINOP_NOTEQUAL, PREC_EQUAL, 0},
+  {"==", BINOP_EQUAL, PREC_ORDER, 0},
+  {"!=", BINOP_NOTEQUAL, PREC_ORDER, 0},
   {"<=", BINOP_LEQ, PREC_ORDER, 0},
   {">=", BINOP_GEQ, PREC_ORDER, 0},
   {">", BINOP_GTR, PREC_ORDER, 0},
@@ -106,9 +106,11 @@ static const struct op_print d_op_print_tab[] =
   {"<<", BINOP_LSH, PREC_SHIFT, 0},
   {"+", BINOP_ADD, PREC_ADD, 0},
   {"-", BINOP_SUB, PREC_ADD, 0},
+  {"~", BINOP_CONCAT, PREC_ADD, 0},
   {"*", BINOP_MUL, PREC_MUL, 0},
   {"/", BINOP_DIV, PREC_MUL, 0},
   {"%", BINOP_REM, PREC_MUL, 0},
+  {"^^", BINOP_EXP, PREC_REPEAT, 0},
   {"@", BINOP_REPEAT, PREC_REPEAT, 0},
   {"-", UNOP_NEG, PREC_PREFIX, 0},
   {"!", UNOP_LOGICAL_NOT, PREC_PREFIX, 0},
@@ -228,8 +230,8 @@ static const struct language_defn d_language_defn =
   array_row_major,
   macro_expansion_no,
   &exp_descriptor_c,
-  c_parse,
-  c_error,
+  d_parse,
+  d_error,
   null_post_parser,
   c_printchar,			/* Print a character constant.  */
   c_printstr,			/* Function to print string constant.  */
diff --git a/gdb/d-lang.h b/gdb/d-lang.h
index ca9126b..216fd03 100644
--- a/gdb/d-lang.h
+++ b/gdb/d-lang.h
@@ -54,6 +54,12 @@ struct builtin_d_type
   struct type *builtin_dchar;
 };
 
+/* Defined in d-exp.y.  */
+
+extern int d_parse (struct parser_state *);
+
+extern void d_error (char *);
+
 /* Defined in d-lang.c  */
 
 extern const char *d_main_name (void);
