diff mbox

[D] Add grammar support for sizeof and typeof

Message ID CABOHX+fnBMXmbQDkp0meAqQW9JezkN7i-t6mXdgLigYTYcWEzw@mail.gmail.com
State New
Headers show

Commit Message

Iain Buclaw Sept. 14, 2015, 3:33 p.m. UTC
On 14 September 2015 at 15:38, Iain Buclaw <ibuclaw@gdcproject.org> wrote:
> Hi,
>
> This adds support for D-style (T).sizeof, (E).sizeof, and typeof(E)
> syntax to the gdb grammar for the D language.  All of which are
> trivial additions that need no special support.
>
> Regards
> Iain.

Forgot about tests for this, these are easily done without having a D compiler.

Comments

Iain Buclaw Oct. 6, 2015, 4:49 p.m. UTC | #1
On 14 September 2015 at 17:33, Iain Buclaw <ibuclaw@gdcproject.org> wrote:
> On 14 September 2015 at 15:38, Iain Buclaw <ibuclaw@gdcproject.org> wrote:
>> Hi,
>>
>> This adds support for D-style (T).sizeof, (E).sizeof, and typeof(E)
>> syntax to the gdb grammar for the D language.  All of which are
>> trivial additions that need no special support.
>>
>> Regards
>> Iain.
>
> Forgot about tests for this, these are easily done without having a D compiler.


Belated ping.  Any remarks?  Otherwise I'll just go ahead with it as
it's a trivial grammar change.

Regards
Iain.
Iain Buclaw Oct. 8, 2015, 7:44 p.m. UTC | #2
On 6 October 2015 at 18:49, Iain Buclaw <ibuclaw@gdcproject.org> wrote:
> On 14 September 2015 at 17:33, Iain Buclaw <ibuclaw@gdcproject.org> wrote:
>> On 14 September 2015 at 15:38, Iain Buclaw <ibuclaw@gdcproject.org> wrote:
>>> Hi,
>>>
>>> This adds support for D-style (T).sizeof, (E).sizeof, and typeof(E)
>>> syntax to the gdb grammar for the D language.  All of which are
>>> trivial additions that need no special support.
>>>
>>> Regards
>>> Iain.
>>
>> Forgot about tests for this, these are easily done without having a D compiler.
>
>
> Belated ping.  Any remarks?  Otherwise I'll just go ahead with it as
> it's a trivial grammar change.
>

I've gone ahead and committed it.
diff mbox

Patch

gdb/ChangeLog:

	* d-exp.y: (UnaryExpression): Add grammar support for 'type.sizeof'.
	(PostfixExpression): Add grammar support for 'expr.sizeof'.
	(PrimaryExpression): Add grammar support for 'typeof(expr)'.

gdb/testsuite/ChangeLog:

	* gdb.dlang/properties.exp: New file.

---
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index dd87d8a..036befd 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/gdb.dlang/properties.exp b/gdb/testsuite/gdb.dlang/properties.exp
new file mode 100644
index 0000000..7d12d88
--- /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."
+}