Move Cdefs to the top of the record body.

Refine when field attribute values get double-quoted.
2010-04-15 11:32:56 -05:00
parent 510027aa2c
commit 64cfd30f62
1 changed files with 3 additions and 3 deletions
@@ -42,17 +42,17 @@ sub OutputRecordtypes {
    my ($out, $recordtypes) = @_;
    while (my ($name, $recordtype) = each %{$recordtypes}) {
        printf $out "recordtype(%s) {\n", $name;
+        print $out "    %$_\n"
+            foreach $recordtype->cdefs;
        foreach $field ($recordtype->fields) {
            printf $out "    field(%s, %s) {\n",
                $field->name, $field->dbf_type;
            while (my ($attr, $val) = each %{$field->attributes}) {
-                $val = "\"$val\"" if $val =~ m/\s/;
+                $val = "\"$val\"" if $val !~ m/^[a-zA-Z0-9_\-+:.\[\]<>;]*$/;
                printf $out "        %s(%s)\n", $attr, $val;
            }
            print $out "    }\n";
        }
-        print $out "% $_\n"
-            foreach $recordtype->cdefs;
        printf $out "}\n";
        printf $out "device(%s, %s, %s, \"%s\")\n",
            $name, $_->link_type, $_->name, $_->choice