This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Parsing of spaceship operator (work in progress)

From: Tim van Deurzen <tim at kompiler dot org>
To: gcc-patches at gcc dot gnu dot org, nathan at acm dot org, jason at redhat dot com
Date: Mon, 5 Nov 2018 23:39:40 +0100
Subject: Parsing of spaceship operator (work in progress)
Arc-authentication-results: i=1; auth=pass smtp.auth=tim smtp.mailfrom=tim at kompiler dot org
Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=kompiler.org; s=dkim; t=1541457581; h=from:subject:date:message-id:to:mime-version:content-type; bh=300yfCVwWKtt/LtW4jOcfq9hdaL4397Ep6xyPlRQN90=; b=Yk+hS/YtFr6l+wHT1NWICTKKRP5QPJpfMwNtWEp51PM2c6mTHjvKo/VsnF3zCf37tvnaGw JQNPFy4Qix6FpkcnjdaW/P+iU/xAf8XMmvnXylCzoGJMuxEPlTZEVwsTVae1KawAr4gu0K kK2GUD9SHZpZRvRMYEkwk/HfC7pHFXUug3yQ1JGGNbVbOo7JZ/WDPi86kjpWE8gr869PZv 93zquuQIqXmJgc585tvlBlSBpQ39hQ7gTE9BAhLWIOg9DjgocPjSnh13oDOc2TJTJiMd9W Bz86koqoWxMTwcgXLtemBwm0oPNPdgQfR90V5Wdcw5jMjusKbGhaIDRs0QnuqA==
Arc-seal: i=1; s=dkim; d=kompiler.org; t=1541457581; a=rsa-sha256; cv=none; b=AF0ha6ajkGbCmzbZkp5k9CBk9VR5fXxPZIhuutzguABxF6/xzkv2cQCXQM/W79EQij47ZKyjVN9lu/JXaC0SUIDt6u+ZVH53uKFBMxLUGv1ZE2Ao1opRKO8uC6ZWnm6XcUkjT4moubWcpSiBszMFHg/UVAw2Bnyrin+KaKf0lC7sZIsIoPYOimbjjiUYhxTx670MwFK4RjDmluaUSn+ynTGQqtOp5fjDvr7wJ5QpN8ta46hLwGD8oeUtsMAa8NyaF404Bar9Sw8E9ufkPohahbt0en53DqT24sSlDuCcnrMRHWLb6V7B8ctDENvlEZll+XTxFpN/A2DNubYPpmvSfQ==

Hello all,

I've been getting to know my way around the c++ compiler front-end while
implementing the spaceship operator. To ensure this feature is part of
the next release I'm including my work so far as a patch. Testing and
development are still very much ongoing.

This patch adds only the new token from the pre-pocessor and its
recognition / use in the C++ front-end.

Tim.


diff --git gcc/cp/ChangeLog gcc/cp/ChangeLog
index b0dc668d9df..cb5ab8feb05 100644
--- gcc/cp/ChangeLog
+++ gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2018-11-05  Tim van Deurzen  <tim@kompiler.org>
+
+    Add new tree code for the spaceship operator.
+    * cp-tree.def: Add new tree code.
+    Add new operator.
+    * operators.def: New binary operator.
+    Implement parsing of the spaceship operator.
+    * parser.c: Add new token and tree code.
+
 2018-11-04  Jason Merrill  <jason@redhat.com>
 
     Implement UDL changes from P0732R2.
diff --git gcc/cp/cp-tree.def gcc/cp/cp-tree.def
index c64225ded6f..6da2d6b9b38 100644
--- gcc/cp/cp-tree.def
+++ gcc/cp/cp-tree.def
@@ -594,6 +594,7 @@ DEFTREECODE (PARM_CONSTR, "parm_constr",
tcc_expression, 2)
 DEFTREECODE (CONJ_CONSTR, "conj_constr", tcc_expression, 2)
 DEFTREECODE (DISJ_CONSTR, "disj_constr", tcc_expression, 2)
 
+DEFTREECODE (SPACESHIP_EXPR, "spaceship_expr", tcc_expression, 2)
 
 /*
 Local variables:
diff --git gcc/cp/operators.def gcc/cp/operators.def
index 07f586b1c28..ac96e27c124 100644
--- gcc/cp/operators.def
+++ gcc/cp/operators.def
@@ -110,6 +110,7 @@ DEF_OPERATOR ("<", LT_EXPR, "lt", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR (">", GT_EXPR, "gt", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR ("<=", LE_EXPR, "le", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR (">=", GE_EXPR, "ge", OVL_OP_FLAG_BINARY)
+DEF_OPERATOR ("<=>", SPACESHIP_EXPR, "le", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR ("&&", TRUTH_ANDIF_EXPR, "aa", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR ("||", TRUTH_ORIF_EXPR, "oo", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR (",", COMPOUND_EXPR, "cm", OVL_OP_FLAG_BINARY)
diff --git gcc/cp/parser.c gcc/cp/parser.c
index 30a47662f55..c0de47a7550 100644
--- gcc/cp/parser.c
+++ gcc/cp/parser.c
@@ -1893,6 +1893,8 @@ static const cp_parser_binary_operations_map_node
binops[] = {
   { CPP_LSHIFT, LSHIFT_EXPR, PREC_SHIFT_EXPRESSION },
   { CPP_RSHIFT, RSHIFT_EXPR, PREC_SHIFT_EXPRESSION },
 
+  /* FIXME check precedence of spaceship operator. */
+  { CPP_SPACESHIP, SPACESHIP_EXPR, PREC_RELATIONAL_EXPRESSION },
   { CPP_LESS, LT_EXPR, PREC_RELATIONAL_EXPRESSION },
   { CPP_GREATER, GT_EXPR, PREC_RELATIONAL_EXPRESSION },
   { CPP_LESS_EQ, LE_EXPR, PREC_RELATIONAL_EXPRESSION },
@@ -15052,6 +15054,10 @@ cp_parser_operator (cp_parser* parser)
       op = GE_EXPR;
       break;
 
+    case CPP_SPACESHIP:
+      op = SPACESHIP_EXPR;
+      break;
+
     case CPP_AND_AND:
       op = TRUTH_ANDIF_EXPR;
       break;
diff --git libcpp/ChangeLog libcpp/ChangeLog
index 4f280471ba4..5a73b66b3e8 100644
--- libcpp/ChangeLog
+++ libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-05  Tim van Deurzen  <tim@kompiler.org>
+    * cpplib.h: Add spaceship operator for C++.
+    * lex.c: Implement conditional lexing of spaceship operator for C++20.
+
 2018-11-05  Martin Liska  <mliska@suse.cz>
 
     * symtab.c (ht_dump_statistics): Replace %zu with %lu format.
diff --git libcpp/include/cpplib.h libcpp/include/cpplib.h
index aad836d2192..55869278f5f 100644
--- libcpp/include/cpplib.h
+++ libcpp/include/cpplib.h
@@ -78,6 +78,7 @@ struct _cpp_file;
   OP(NOT_EQ,        "!=")                        \
   OP(GREATER_EQ,    ">=")                        \
   OP(LESS_EQ,        "<=")                        \
+  OP(SPACESHIP,        "<=>")                        \
                                     \
   /* These two are unary + / - in preprocessor expressions.  */        \
   OP(PLUS_EQ,        "+=")    /* math */                \
diff --git libcpp/lex.c libcpp/lex.c
index c6e34b33343..b6423d15cc6 100644
--- libcpp/lex.c
+++ libcpp/lex.c
@@ -2963,7 +2963,14 @@ _cpp_lex_direct (cpp_reader *pfile)
 
       result->type = CPP_LESS;
       if (*buffer->cur == '=')
-    buffer->cur++, result->type = CPP_LESS_EQ;
+          if (CPP_OPTION(pfile, cplusplus)
+              && (CPP_OPTION(pfile, lang) == CLK_CXX2A ||
CPP_OPTION(pfile, lang) == CLK_GNUCXX2A)
+              && buffer->cur[1] == '>')
+            {
+              buffer->cur += 2, result->type = CPP_SPACESHIP;
+            } else {
+              buffer->cur++, result->type = CPP_LESS_EQ;
+            }
       else if (*buffer->cur == '<')
     {
       buffer->cur++;

diff --git gcc/cp/ChangeLog gcc/cp/ChangeLog
index b0dc668d9df..cb5ab8feb05 100644
--- gcc/cp/ChangeLog
+++ gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2018-11-05  Tim van Deurzen  <tim@kompiler.org>
+
+	Add new tree code for the spaceship operator.
+	* cp-tree.def: Add new tree code.
+	Add new operator.
+	* operators.def: New binary operator.
+	Implement parsing of the spaceship operator.
+	* parser.c: Add new token and tree code.
+
 2018-11-04  Jason Merrill  <jason@redhat.com>
 
 	Implement UDL changes from P0732R2.
diff --git gcc/cp/cp-tree.def gcc/cp/cp-tree.def
index c64225ded6f..6da2d6b9b38 100644
--- gcc/cp/cp-tree.def
+++ gcc/cp/cp-tree.def
@@ -594,6 +594,7 @@ DEFTREECODE (PARM_CONSTR, "parm_constr", tcc_expression, 2)
 DEFTREECODE (CONJ_CONSTR, "conj_constr", tcc_expression, 2)
 DEFTREECODE (DISJ_CONSTR, "disj_constr", tcc_expression, 2)
 
+DEFTREECODE (SPACESHIP_EXPR, "spaceship_expr", tcc_expression, 2)
 
 /*
 Local variables:
diff --git gcc/cp/operators.def gcc/cp/operators.def
index 07f586b1c28..ac96e27c124 100644
--- gcc/cp/operators.def
+++ gcc/cp/operators.def
@@ -110,6 +110,7 @@ DEF_OPERATOR ("<", LT_EXPR, "lt", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR (">", GT_EXPR, "gt", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR ("<=", LE_EXPR, "le", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR (">=", GE_EXPR, "ge", OVL_OP_FLAG_BINARY)
+DEF_OPERATOR ("<=>", SPACESHIP_EXPR, "le", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR ("&&", TRUTH_ANDIF_EXPR, "aa", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR ("||", TRUTH_ORIF_EXPR, "oo", OVL_OP_FLAG_BINARY)
 DEF_OPERATOR (",", COMPOUND_EXPR, "cm", OVL_OP_FLAG_BINARY)
diff --git gcc/cp/parser.c gcc/cp/parser.c
index 30a47662f55..c0de47a7550 100644
--- gcc/cp/parser.c
+++ gcc/cp/parser.c
@@ -1893,6 +1893,8 @@ static const cp_parser_binary_operations_map_node binops[] = {
   { CPP_LSHIFT, LSHIFT_EXPR, PREC_SHIFT_EXPRESSION },
   { CPP_RSHIFT, RSHIFT_EXPR, PREC_SHIFT_EXPRESSION },
 
+  /* FIXME check precedence of spaceship operator. */
+  { CPP_SPACESHIP, SPACESHIP_EXPR, PREC_RELATIONAL_EXPRESSION },
   { CPP_LESS, LT_EXPR, PREC_RELATIONAL_EXPRESSION },
   { CPP_GREATER, GT_EXPR, PREC_RELATIONAL_EXPRESSION },
   { CPP_LESS_EQ, LE_EXPR, PREC_RELATIONAL_EXPRESSION },
@@ -15052,6 +15054,10 @@ cp_parser_operator (cp_parser* parser)
       op = GE_EXPR;
       break;
 
+    case CPP_SPACESHIP:
+      op = SPACESHIP_EXPR;
+      break;
+
     case CPP_AND_AND:
       op = TRUTH_ANDIF_EXPR;
       break;
diff --git libcpp/ChangeLog libcpp/ChangeLog
index 4f280471ba4..5a73b66b3e8 100644
--- libcpp/ChangeLog
+++ libcpp/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-05  Tim van Deurzen  <tim@kompiler.org>
+	* cpplib.h: Add spaceship operator for C++.
+	* lex.c: Implement conditional lexing of spaceship operator for C++20.
+
 2018-11-05  Martin Liska  <mliska@suse.cz>
 
 	* symtab.c (ht_dump_statistics): Replace %zu with %lu format.
diff --git libcpp/include/cpplib.h libcpp/include/cpplib.h
index aad836d2192..55869278f5f 100644
--- libcpp/include/cpplib.h
+++ libcpp/include/cpplib.h
@@ -78,6 +78,7 @@ struct _cpp_file;
   OP(NOT_EQ,		"!=")						\
   OP(GREATER_EQ,	">=")						\
   OP(LESS_EQ,		"<=")						\
+  OP(SPACESHIP,		"<=>")						\
 									\
   /* These two are unary + / - in preprocessor expressions.  */		\
   OP(PLUS_EQ,		"+=")	/* math */				\
diff --git libcpp/lex.c libcpp/lex.c
index c6e34b33343..b6423d15cc6 100644
--- libcpp/lex.c
+++ libcpp/lex.c
@@ -2963,7 +2963,14 @@ _cpp_lex_direct (cpp_reader *pfile)
 
       result->type = CPP_LESS;
       if (*buffer->cur == '=')
-	buffer->cur++, result->type = CPP_LESS_EQ;
+          if (CPP_OPTION(pfile, cplusplus)
+              && (CPP_OPTION(pfile, lang) == CLK_CXX2A || CPP_OPTION(pfile, lang) == CLK_GNUCXX2A)
+              && buffer->cur[1] == '>')
+            {
+              buffer->cur += 2, result->type = CPP_SPACESHIP;
+            } else {
+              buffer->cur++, result->type = CPP_LESS_EQ;
+            }
       else if (*buffer->cur == '<')
 	{
 	  buffer->cur++;

Follow-Ups:
- Re: Parsing of spaceship operator (work in progress)
  - From: Jason Merrill

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]