Skip to contentSkip to conversation

Add the __restrict__ keyword

PATCH In review Ramsay Jones 2 participants 2 messages Sep 27, 2014 – Sep 30, 2014 Sparse checker

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/10 Add the __restrict__ keyword

---

Hi Chris,

As promised, this adds tests for __restrict__ and restrict keywords to validation/restrict-array.c.

[Note: I had intended to include a comment, just as for the new test file, reminding gcc users to use -std=c99 etc., in the case of the 'restrict' keyword (I always compile tests with gcc), but I forgot. :( ]

ATB,
Ramsay Jones

 ident-list.h                    |  2 +-
 parse.c                         |  3 ++-
 validation/alternate-keywords.c | 46 +++++++++++++++++++++++++++++++++++++++++
 validation/reserved.c           |  1 +
 validation/restrict-array.c     | 25 ++++++++++++++++++++++
 5 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 validation/alternate-keywords.c
ident-list.h +1 -1
index c0fc18f..d5a145f 100644
@@ -86,7 +86,7 @@ IDENT(stdcall); IDENT(__stdcall__);
 IDENT(fastcall); IDENT(__fastcall__);
 IDENT(dllimport); IDENT(__dllimport__);
 IDENT(dllexport); IDENT(__dllexport__);
-IDENT(restrict); IDENT(__restrict);
+IDENT(restrict); IDENT(__restrict); IDENT(__restrict__);
 IDENT(artificial); IDENT(__artificial__);
 IDENT(leaf); IDENT(__leaf__);
 IDENT(vector_size); IDENT(__vector_size__);
parse.c +2 -1
index eaa1883..ec835ef 100644
@@ -435,6 +435,7 @@ static struct init_keyword {
 	/* Ignored for now.. */
 	{ "restrict",	NS_TYPEDEF, .op = &restrict_op},
 	{ "__restrict",	NS_TYPEDEF, .op = &restrict_op},
+	{ "__restrict__",	NS_TYPEDEF, .op = &restrict_op},
 
 	/* Storage class */
 	{ "auto",	NS_TYPEDEF, .op = &auto_op },
@@ -1553,7 +1554,7 @@ static struct token *abstract_array_declarator(struct token *token, struct symbo
 
 	token = abstract_array_static_declarator(token, &has_static);
 
-	if (match_idents(token, &restrict_ident, &__restrict_ident, NULL))
+	if (match_idents(token, &restrict_ident, &__restrict_ident, &__restrict___ident, NULL))
 		token = abstract_array_static_declarator(token->next, &has_static);
 	token = parse_expression(token, &expr);
 	sym->array_size = expr;
validation/alternate-keywords.c new file +46 -0

46 lines not on this page · raw message

validation/reserved.c +1 -0
index caacd21..e5d7af8 100644
@@ -30,6 +30,7 @@ reserved.c:8:12: error: Trying to use reserved word '__const' as identifier
 reserved.c:9:12: error: Trying to use reserved word '__const__' as identifier
 reserved.c:10:12: error: Trying to use reserved word 'restrict' as identifier
 reserved.c:11:12: error: Trying to use reserved word '__restrict' as identifier
+reserved.c:12:12: error: Trying to use reserved word '__restrict__' as identifier
 reserved.c:13:12: error: Trying to use reserved word 'typedef' as identifier
 reserved.c:14:12: error: Trying to use reserved word '__typeof' as identifier
 reserved.c:15:12: error: Trying to use reserved word '__typeof__' as identifier
validation/restrict-array.c +25 -0
index 3facebf..04bfdad 100644
@@ -7,6 +7,31 @@ extern int lio_listio64 (int __mode,
 			 struct aiocb64 *__const __list[__restrict_arr],
 			 int __nent, struct sigevent *__restrict __sig);
 
+#undef __restrict_arr
+#define __restrict_arr __restrict__
+
+struct gaicb;
+
+extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr],
+			  int __ent, struct sigevent *__restrict __sig);
+
+#undef __restrict_arr
+#define __restrict_arr restrict
+
+typedef struct re_pattern_buffer regex_t;
+typedef int regoff_t;
+typedef struct
+{
+  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
+  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
+} regmatch_t;
+typedef unsigned long int size_t;
+
+extern int regexec (const regex_t *__restrict __preg,
+		    const char *__restrict __string, size_t __nmatch,
+		    regmatch_t __pmatch[__restrict_arr],
+		    int __eflags);
+
 /*
  * check-name: restrict array attribute
  */
Signature · 1 line
2.1.0
maintainer
#1 lore raw
Quoted 8 lines · Ramsay Jones

---

Hi Chris,

As promised, this adds tests for __restrict__ and restrict keywords to validation/restrict-array.c.

Thanks, that looks good.

I have applied your patch to a branch with your other patches.

I will post the branch link for review shortly.

Chris