[patch][rfc] New CGEN Attribute Type: string

[Dave Brolley <brolley@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

Hi,

I would like to commit the attached patch which adds a new attribute 
type: string. This is used by a new CGEN application for generating 
intrinsic functions which will be submitted along with the Toshiba MeP 
port soon, but is general enough to be considered separately.

Seeking approval to commit.

Dave

[-- Attachment #2: cgen.string-attr.ChangeLog --]
[-- Type: text/plain, Size: 716 bytes --]

2007-01-12  Dave Brolley  <brolley@redhat.com>

	* Contribute the following changes:
	2005-04-05  Richard Sandiford  <rsandifo@redhat.com>

	* attr.scm (<string-attribute>): New attribute class.
	(attr-kind): Handle <string-attribute>.
	(parse-simple-attribute): New function.
	(<boolean-attribute> 'parse-value): Use parse-simple-attribute.
	(<bitset-attribute> 'parse-value): Likewise.
	(<boolean-attribute> 'parse-value): Likewise.
	(<enum-attribute> 'parse-value): Likewise.
	(<string-attribute> 'parse-value): New function.
	(-attr-parse): Handle <string-attribute>.
	(-attr-read): Likewise.
	(<string-attribute> 'gen-value-for-defn-raw): New function.
	(<string-attribute> 'gen-value-for-defn): New function.


[-- Attachment #3: cgen.string-attr.patch.txt --]
[-- Type: text/plain, Size: 7902 bytes --]

Index: cgen/attr.scm
===================================================================
RCS file: /cvs/src/src/cgen/attr.scm,v
retrieving revision 1.4
diff -c -p -r1.4 attr.scm
*** cgen/attr.scm	28 Oct 2005 19:30:02 -0000	1.4
--- cgen/attr.scm	11 Jan 2007 19:09:39 -0000
***************
*** 15,20 ****
--- 15,21 ----
  ; Boolean attributes are specified as (NAME #t) or (NAME #f),
  ; but for convenience ATTR and !ATTR are also supported.
  ; integer/enum attrs are specified as (ATTR value).
+ ; string attrs are specified as (ATTR value).
  ; Bitset attrs are specified as (ATTR val1,val2,val3).
  ; In all cases the value needn't be constant, and can be an expression,
  ; though expressions are currently only supported for META-attributes
***************
*** 90,95 ****
--- 91,105 ----
  	      nil)
  )
  
+ ; VALUES is ignored for string-attribute.
+ 
+ (define <string-attribute>
+   (class-make '<string-attribute>
+ 	      '(<attribute>)
+ 	      '(default values)
+ 	      nil)
+ )
+ 
  ; For bitset attributes VALUES is a list of
  ; (symbol bit-number-or-#f attr-list comment-or-#f),
  ; one for each bit.
***************
*** 143,153 ****
  (define (bitset-attr? x) (class-instance? <bitset-attribute> x))
  
  ; Return a symbol indicating the kind of attribute ATTR is.
! ; The result is one of boolean,integer,enum,bitset.
  
  (define (attr-kind attr)
    (case (object-class-name attr)
      ((<boolean-attribute>) 'boolean)
      ((<integer-attribute>) 'integer)
      ((<enum-attribute>)    'enum)
      ((<bitset-attribute>)  'bitset)
--- 153,164 ----
  (define (bitset-attr? x) (class-instance? <bitset-attribute> x))
  
  ; Return a symbol indicating the kind of attribute ATTR is.
! ; The result is one of boolean,integer,enum,bitset or string.
  
  (define (attr-kind attr)
    (case (object-class-name attr)
      ((<boolean-attribute>) 'boolean)
+     ((<string-attribute>)  'string)
      ((<integer-attribute>) 'integer)
      ((<enum-attribute>)    'enum)
      ((<bitset-attribute>)  'bitset)
***************
*** 184,201 ****
  
  (define (enum-attr-make name value) (cons name value))
  
  ; A boolean attribute's value is either #t or #f.
  
  (method-make!
   <boolean-attribute> 'parse-value
!  (lambda (self errtxt val)
!    (if (and (not (null? val))
! 	    (boolean? (car val)))
!        (cons (obj:name self) (car val))
!        (parse-error errtxt "boolean attribute not one of #f/#t"
! 		    (cons (obj:name self) val))))
  )
  
  ; A bitset attribute's value is a comma separated list of elements.
  ; We don't validate the values.  In the case of the MACH attribute,
  ; there's no current mechanism to create it after all define-mach's have
--- 195,220 ----
  
  (define (enum-attr-make name value) (cons name value))
  
+ (define (parse-simple-attribute right-type? message)
+   (lambda (self errtxt val)
+     (if (and (not (null? val))
+ 	     (right-type? (car val))
+ 	     (null? (cdr val)))
+ 	(cons (obj:name self) (car val))
+ 	(parse-error errtxt message (cons (obj:name self) val))))
+ )
+ 
  ; A boolean attribute's value is either #t or #f.
  
  (method-make!
   <boolean-attribute> 'parse-value
!  (parse-simple-attribute boolean? "boolean attribute not one of #f/#t")
  )
  
+ (method-make!
+  <string-attribute> 'parse-value
+  (parse-simple-attribute string? "invalid argument to string attribute"))
+ 
  ; A bitset attribute's value is a comma separated list of elements.
  ; We don't validate the values.  In the case of the MACH attribute,
  ; there's no current mechanism to create it after all define-mach's have
***************
*** 208,221 ****
  
  (method-make!
   <bitset-attribute> 'parse-value
!  (lambda (self errtxt val)
!    (if (and (not (null? val))
! 	    (or (symbol? (car val))
! 		(string? (car val)))
! 	    (null? (cdr val)))
!        (cons (obj:name self) (car val))
!        (parse-error errtxt "improper bitset attribute"
! 		    (cons (obj:name self) val))))
  )
  
  ; An integer attribute's value is a number
--- 227,234 ----
  
  (method-make!
   <bitset-attribute> 'parse-value
!  (parse-simple-attribute (lambda (x) (or (symbol? x) (string? x)))
! 			 "improper bitset attribute")
  )
  
  ; An integer attribute's value is a number
***************
*** 223,248 ****
  
  (method-make!
   <integer-attribute> 'parse-value
!  (lambda (self errtxt val)
!    (if (and (not (null? val))
! 	    (or (number? (car val)) (symbol? (car val)))
! 	    (null? (cdr val)))
!        (cons (obj:name self) (car val))
!        (parse-error errtxt "improper integer attribute"
! 		    (cons (obj:name self) val))))
  )
  
  ; An enum attribute's value is a symbol representing that value.
  
  (method-make!
   <enum-attribute> 'parse-value
!  (lambda (self errtxt val)
!    (if (and (not (null? val))
! 	    (or (symbol? (car val)) (string? (car val)))
! 	    (null? (cdr val)))
!        (cons (obj:name self) (car val))
!        (parse-error errtxt "improper enum attribute"
! 		    (cons (obj:name self) val))))
  )
  
  ; Parse a boolean attribute's value definition.
--- 236,251 ----
  
  (method-make!
   <integer-attribute> 'parse-value
!  (parse-simple-attribute (lambda (x) (or (number? x) (symbol? x)))
! 			 "improper integer attribute")
  )
  
  ; An enum attribute's value is a symbol representing that value.
  
  (method-make!
   <enum-attribute> 'parse-value
!  (parse-simple-attribute (lambda (x) (or (symbol? x) (string? x)))
! 			 "improper enum attribute")
  )
  
  ; Parse a boolean attribute's value definition.
***************
*** 255,260 ****
--- 258,271 ----
         (parse-error errtxt "boolean value list must be (#f #t)" values)))
  )
  
+ ; Ignore values for strings.  We can't do any error checking since
+ ; the default value is (#f #t).
+ 
+ (method-make!
+  <string-attribute> 'parse-value-def
+  (lambda (self errtxt values) #f)
+ )
+ 
  ; Parse a bitset attribute's value definition.
  ; FIXME: treated as enum?
  
***************
*** 297,303 ****
  ; description in the .cpu file.
  ; All arguments are in raw (non-evaluated) form.
  ; TYPE-CLASS is the class of the object to create.
! ; i.e. one of <{boolean,bitset,integer,enum}-attribute>.
  ; If DEFAULT is #f, use the first value.
  ; ??? Allowable values for integer attributes is wip.
  
--- 308,314 ----
  ; description in the .cpu file.
  ; All arguments are in raw (non-evaluated) form.
  ; TYPE-CLASS is the class of the object to create.
! ; i.e. one of <{boolean,bitset,integer,enum,string}-attribute>.
  ; If DEFAULT is #f, use the first value.
  ; ??? Allowable values for integer attributes is wip.
  
***************
*** 318,323 ****
--- 329,340 ----
  		(not (rtx? default)))
  	   (parse-error errtxt "invalid default" default))
         (elm-xset! result 'default default))
+       ((<string-attribute>)
+        (let ((default (or default "")))
+ 	 (if (and (not (string? default))
+ 		  (not (rtx? default)))
+ 	     (parse-error errtxt "invalid default" default))
+ 	 (elm-xset! result 'default default)))
        ((<integer-attribute>)
         (let ((default (if default default (if (null? values) 0 (car values)))))
  	 (if (and (not (integer? default))
***************
*** 359,364 ****
--- 376,382 ----
  	    (case elm-name
  	      ((type) (set! type-class (case (cadr arg)
  					((boolean) <boolean-attribute>)
+ 					((string) <string-attribute>)
  					((bitset) <bitset-attribute>)
  					((integer) <integer-attribute>)
  					((enum) <enum-attribute>)
***************
*** 1038,1043 ****
--- 1056,1075 ----
       ", 0 } }")
   )
  )
+ 
+ ;; Doesn't handle escape sequences.
+ (method-make!
+  <string-attribute> 'gen-value-for-defn-raw
+  (lambda (self value)
+    (string-append "\"" value "\""))
+ )
+ 
+ (method-make!
+  <string-attribute> 'gen-value-for-defn
+  (lambda (self value)
+    (send self 'gen-value-for-defn-raw value))
+ )
+ 
  \f
  ; Called before loading a .cpu file to initialize.