[Ltrace-devel] [PATCH 8/11] typedefs

Steve Fink sphink at gmail.com
Sat Aug 5 23:57:37 UTC 2006


-------------- next part --------------
From 8cb2b73ba6d2ec4e669f4505076e3b1b7e042254 Mon Sep 17 00:00:00 2001
From: Steve Fink sphink at gmail.com <sphink at gmail.com>
Date: Sun, 23 Jul 2006 16:49:08 -0700
Subject: [PATCH 8/11] typedefs for parameter types

Allows creating aliases of complex parameters, so that you don't
have to keep repeating enum(RED=0,GREEN=1,BLUE=2) over and over.
---
 ChangeLog                              |    1 
 etc/ltrace.conf                        |    9 ++++
 read_config_file.c                     |   71 ++++++++++++++++++++++++++++++++
 testsuite/ltrace.main/parameters-lib.c |    5 ++
 testsuite/ltrace.main/parameters.c     |    3 +
 testsuite/ltrace.main/parameters.conf  |    2 +
 testsuite/ltrace.main/parameters.exp   |    2 +
 7 files changed, 93 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13239bc..5404ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2006-07-20    Steve Fink <sphink at gmail.com>
 
+	* read-config-file.c: Implement typedef (aliased parameter types)
 	* various: Implement short, ushort, float types
 
 2006-07-21    Steve Fink <sphink at gmail.com>
diff --git a/etc/ltrace.conf b/etc/ltrace.conf
index 66db092..2ef97e7 100644
--- a/etc/ltrace.conf
+++ b/etc/ltrace.conf
@@ -32,6 +32,15 @@
 ; string0	== (char *)			[same as string[retval]]
 ; stringN	== (char *)		[N>0]	[same as string[argN]]
 
+; Typedefs
+;
+; To make it easier to specify argument lists, you can use 'typedef'
+; directives to avoid repeating complex parameter descriptors:
+;
+;   typedef color = enum(RED=1,BLUE=2,GREEN=3)
+;   void draw_line(color,int,int,int,int)
+;   void draw_square(color,int,int,int,int)
+;
 ; Enumerations
 ;
 ; The syntax is a parenthesized list of key=value assignments, like so:
diff --git a/read_config_file.c b/read_config_file.c
index dab66b3..76104dc 100644
--- a/read_config_file.c
+++ b/read_config_file.c
@@ -15,6 +15,8 @@ static int line_no;
 static char *filename;
 static int error_count = 0;
 
+static arg_type_info *parse_type(char **str);
+
 struct function *list_of_functions = NULL;
 
 static struct list_of_pt_t {
@@ -214,13 +216,82 @@ static int parse_argnum(char **str)
     return n * multiplier;
 }
 
+struct typedef_node_t {
+    char *name;
+    arg_type_info *info;
+    struct typedef_node_t *next;
+} *typedefs = NULL;
+
+static arg_type_info *lookup_typedef(char **str)
+{
+    struct typedef_node_t *node;
+    char *end = *str;
+    while (*end && (isalnum(*end) || *end == '_'))
+	++end;
+    if (end == *str)
+	return NULL;
+
+    for (node = typedefs; node != NULL; node = node->next) {
+	if (strncmp(*str, node->name, end - *str) == 0) {
+	    (*str) += strlen(node->name);
+	    return node->info;
+	}
+    }
+
+    return NULL;
+}
+
+static void parse_typedef(char **str)
+{
+    char *name;
+    arg_type_info *info;
+    struct typedef_node_t *binding;
+
+    (*str) += strlen("typedef");
+    eat_spaces(str);
+
+    // Grab out the name of the type
+    name = parse_ident(str);
+
+    // Skip = sign
+    eat_spaces(str);
+    if (**str != '=') {
+	output_line(0,
+		    "Syntax error in `%s', line %d: expected '=', got '%c'",
+		    filename, line_no, **str);
+	error_count++;
+	return;
+    }
+    (*str)++;
+    eat_spaces(str);
+
+    // Parse the type
+    info = parse_type(str);
+
+    // Insert onto beginning of linked list
+    binding = malloc(sizeof(*binding));
+    binding->name = name;
+    binding->info = info;
+    binding->next = typedefs;
+    typedefs = binding;
+}
+
 static arg_type_info *parse_nonpointer_type(char **str)
 {
 	arg_type_info *simple;
 	arg_type_info *info;
 
+	if (strncmp(*str, "typedef", 7) == 0) {
+	    parse_typedef(str);
+	    return lookup_singleton(ARGTYPE_UNKNOWN);
+	}
+
 	simple = str2type(str);
 	if (simple->type == ARGTYPE_UNKNOWN) {
+	    info = lookup_typedef(str);
+	    if (info)
+		return info;
+	    else
 		return simple;		// UNKNOWN
 	}
 
diff --git a/testsuite/ltrace.main/parameters-lib.c b/testsuite/ltrace.main/parameters-lib.c
index 870809d..f5ed3f7 100644
--- a/testsuite/ltrace.main/parameters-lib.c
+++ b/testsuite/ltrace.main/parameters-lib.c
@@ -56,3 +56,8 @@ void func_float(float f1, float f2)
 {
 	printf("%f %f\n", f1, f2);
 }
+
+void func_typedef(int x)
+{
+	printf("typedef'd enum: %d\n", x);
+}
diff --git a/testsuite/ltrace.main/parameters.c b/testsuite/ltrace.main/parameters.c
index 93811c1..b573767 100644
--- a/testsuite/ltrace.main/parameters.c
+++ b/testsuite/ltrace.main/parameters.c
@@ -31,6 +31,7 @@ typedef enum {
   PETUNIA
 } color_t;
 void func_enum(color_t);
+void func_typedef(color_t);
 
 int 
 main ()
@@ -67,5 +68,7 @@ main ()
   func_ushort(33, 34);
   func_float(3.4, -3.4);
 
+  func_typedef(BLUE);
+
   return 0;
 }
diff --git a/testsuite/ltrace.main/parameters.conf b/testsuite/ltrace.main/parameters.conf
index 394919b..dd8294d 100644
--- a/testsuite/ltrace.main/parameters.conf
+++ b/testsuite/ltrace.main/parameters.conf
@@ -9,3 +9,5 @@ void func_enum(enum (RED=0,GREEN=1,BLUE=
 void func_short(short,short)
 void func_ushort(ushort, ushort)
 void func_float(float,float)
+typedef color = enum (RED=0,GREEN=1,BLUE=2,CHARTREUSE=3,PETUNIA=4)
+void func_typedef(color)
diff --git a/testsuite/ltrace.main/parameters.exp b/testsuite/ltrace.main/parameters.exp
index e47dc0d..2026cbd 100644
--- a/testsuite/ltrace.main/parameters.exp
+++ b/testsuite/ltrace.main/parameters.exp
@@ -58,5 +58,7 @@ set pattern "func_ushort(33, 34)"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "func_float(3.40*, -3.40*)"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
+set pattern "func_typedef(BLUE)"
+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
 set pattern "exited (status 0)"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern 1
-- 
1.4.1


More information about the Ltrace-devel mailing list