summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/d-exp.y6
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.dlang/properties.exp93
4 files changed, 109 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a0e721533a..bf71afb55a1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-08 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ * d-exp.y: (UnaryExpression): Support `type.sizeof' expressions.
+ (PostfixExpression): Support `expr.sizeof' expressions.
+ (PrimaryExpression): Support `typeof(expr)' expressions.
+
2015-10-08 Maciej W. Rozycki <macro@imgtec.com>
* MAINTAINERS: Update my email address.
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index 30ff480daef..9e84a47de0f 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -368,6 +368,8 @@ UnaryExpression:
{ write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
| '~' UnaryExpression
{ write_exp_elt_opcode (pstate, UNOP_COMPLEMENT); }
+| TypeExp '.' SIZEOF_KEYWORD
+ { write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
| CastExpression
| PowExpression
;
@@ -410,6 +412,8 @@ PostfixExpression:
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
write_exp_string (pstate, $3);
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+| PostfixExpression '.' SIZEOF_KEYWORD
+ { write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
| PostfixExpression INCREMENT
{ write_exp_elt_opcode (pstate, UNOP_POSTINCREMENT); }
| PostfixExpression DECREMENT
@@ -616,6 +620,8 @@ PrimaryExpression:
write_exp_elt_longcst (pstate, (LONGEST) 0);
write_exp_elt_longcst (pstate, (LONGEST) $1 - 1);
write_exp_elt_opcode (pstate, OP_ARRAY); }
+| TYPEOF_KEYWORD '(' Expression ')'
+ { write_exp_elt_opcode (pstate, OP_TYPEOF); }
;
ArrayLiteral:
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2f077938356..309693629a1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-08 Iain Buclaw <ibuclaw@gdcproject.org>
+
+ * gdb.dlang/properties.exp: New file.
+
2015-10-02 Sandra Loosemore <sandra@codesourcery.com>
* gdb.dwarf2/staticvirtual.exp: Generalize regexp so it can match
diff --git a/gdb/testsuite/gdb.dlang/properties.exp b/gdb/testsuite/gdb.dlang/properties.exp
new file mode 100644
index 00000000000..8e794cfa2bd
--- /dev/null
+++ b/gdb/testsuite/gdb.dlang/properties.exp
@@ -0,0 +1,93 @@
+# Copyright (C) 2015 Free Software Foundation, Inc.
+
+# 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/>.
+
+# Test basic builtin types.
+# NOTE: The tests here intentionally do not require a D compiler.
+
+load_lib "d-support.exp"
+
+if { [skip_d_tests] } { continue }
+
+proc test_d_sizeof {} {
+ # Test use of .sizeof with types and expressions.
+ gdb_test "print bool.sizeof" " = 1"
+ gdb_test "print (bool).sizeof" " = 1"
+
+ gdb_test "print char.sizeof" " = 1"
+ gdb_test "print wchar.sizeof" " = 2"
+ gdb_test "print dchar.sizeof" " = 4"
+
+ gdb_test "print byte.sizeof" " = 1"
+ gdb_test "print ubyte.sizeof" " = 1"
+ gdb_test "print short.sizeof" " = 2"
+ gdb_test "print ushort.sizeof" " = 2"
+ gdb_test "print int.sizeof" " = 4"
+ gdb_test "print uint.sizeof" " = 4"
+ gdb_test "print long.sizeof" " = 8"
+ gdb_test "print ulong.sizeof" " = 8"
+ gdb_test "print cent.sizeof" " = 16"
+ gdb_test "print ucent.sizeof" " = 16"
+
+ gdb_test "print float.sizeof" " = 4"
+ gdb_test "print ifloat.sizeof" " = 4"
+ gdb_test "print double.sizeof" " = 8"
+ gdb_test "print idouble.sizeof" " = 8"
+
+ gdb_test "print (1).sizeof" " = 4"
+ gdb_test "print (1U).sizeof" " = 4"
+ gdb_test "print (1L).sizeof" " = 8"
+ gdb_test "print (1UL).sizeof" " = 8"
+ gdb_test "print (1.0).sizeof" " = 8"
+ gdb_test "print (1.0f).sizeof" " = 4"
+
+ gdb_test "print (7 ^^ 3).sizeof" " = 4"
+ gdb_test "print (7L ^^ 3).sizeof" " = 8"
+ gdb_test "print (7.0 ^^ 3).sizeof" " = 8"
+ gdb_test "print (7.0f ^^ 3).sizeof" " = 4"
+}
+
+proc test_d_typeof {} {
+ # Test use of typeof() with expressions.
+ gdb_test "ptype typeof(false)" "type = bool"
+
+ gdb_test "ptype typeof(1)" "type = int"
+ gdb_test "ptype typeof(1U)" "type = uint"
+ gdb_test "ptype typeof(1L)" "type = long"
+ gdb_test "ptype typeof(1UL)" "type = ulong"
+ gdb_test "ptype typeof(1.0)" "type = double"
+ gdb_test "ptype typeof(1.0L)" "type = real"
+ gdb_test "ptype typeof(1.0f)" "type = float"
+
+ gdb_test "ptype typeof(cast(byte) 1)" "type = byte"
+ gdb_test "ptype typeof(cast(short) 1)" "type = short"
+
+ gdb_test "ptype typeof(7 ^^ 3)" "type = int"
+ gdb_test "ptype typeof(7L ^^ 3)" "type = long"
+ gdb_test "ptype typeof(7.0 ^^ 3)" "type = double"
+ gdb_test "ptype typeof(7.0L ^^ 3)" "type = real"
+ gdb_test "ptype typeof(7.0f ^^ 3)" "type = float"
+}
+
+# Start with a fresh gdb.
+
+gdb_exit
+gdb_start
+
+if [set_lang_d] {
+ test_d_sizeof
+ test_d_typeof
+} else {
+ warning "D type tests suppressed."
+}