#include "config.h"
#include <glib.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include "treefuncs.h"
static GList *class_nodes = NULL;
Node *class = NULL;
+char *chunk_size = NULL;
static GList *typestack = NULL;
-static int stars = 0;
static GList *funcargs = NULL;
static GList *checks = NULL;
static int has_self = FALSE;
g_assert(scope != CLASS_SCOPE);
- if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
- type = pop_type();
+ if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+ type = (Type *)new_type(g_strdup("void"), NULL, NULL);
} else {
- type = (Type *)new_type(0,g_strdup("void"),NULL);
+ type = pop_type();
}
/* a complicated and ugly test to figure out if we have
g_free(defreturn);
defreturn = NULL;
+ g_free(chunk_size);
+ chunk_size = NULL;
+
g_list_foreach(gtktypes, (GFunc)g_free, NULL);
g_list_free(gtktypes);
gtktypes = NULL;
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(1,tn,NULL);
+ type = new_type(tn, g_strdup("*"), NULL);
node = new_funcarg((Type *)type,name,NULL);
funcargs = g_list_prepend(funcargs, node);
}
Node *node;
Node *type;
GList *ch = NULL;
- type = new_type(1,g_strdup(((Class *)class)->otype),NULL);
+ type = new_type(g_strdup(((Class *)class)->otype), g_strdup("*"), NULL);
ch = g_list_append(ch,new_check(NULL_CHECK,NULL));
ch = g_list_append(ch,new_check(TYPE_CHECK,NULL));
node = new_funcarg((Type *)type,id,ch);
}
;
-classdec: CLASS TYPETOKEN FROM TYPETOKEN {
- class = new_class($<id>2,$<id>4,NULL);
+classdec: CLASS TYPETOKEN FROM TYPETOKEN chunk {
+ class = new_class($<id>2,$<id>4,chunk_size,NULL);
}
;
-
+
+chunk:
+ | '(' TOKEN TOKEN ')' {
+ if(strcmp($<id>2,"chunks") == 0) {
+ chunk_size = g_strdup($<id>4);
+ } else {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ }
+ | '(' TOKEN NUMBER ')' {
+ if(strcmp($<id>2,"chunks") == 0) {
+ if(atoi($<id>4) != 0)
+ chunk_size = g_strdup($<id>4);
+ } else {
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ }
+ ;
+
classcode: classcode thing { ; }
| thing { ; }
;
root, $<id>4,
root, $<id>4,
root, $<id>4,
- root, $<id>4,
- root, $<id>4,
- root, $<id>4,
root, $<id>4);
} else {
g_assert_not_reached();
}
- /* get is the same for everything */
- get = g_strdup_printf("ARG = %s->%s;", root, $<id>4);
+ if(strcmp($<id>5, "stringlink")==0) {
+ get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, $<id>4);
+ } else
+ /* For everything else, get is just straight assignment */
+ get = g_strdup_printf("ARG = %s->%s;", root, $<id>4);
g_free($<id>5);
;
-type: type1 { ; }
- | CONST type1 {
- Type *type = typestack->data;
- char *oldname = type->name;
- type->name = g_strconcat("const ",oldname,NULL);
- g_free(oldname);
- }
- ;
-
-type1: type2 {
- Node *node = new_type(0,$<id>1,NULL);
+type: specifier_list pointer {
+ Node *node = new_type($<id>1, $<id>2, NULL);
typestack = g_list_prepend(typestack,node);
- }
- | type2 stars {
- Node *node = new_type(stars,$<id>1,NULL);
- stars = 0;
+ }
+ | specifier_list {
+ Node *node = new_type($<id>1, NULL, NULL);
typestack = g_list_prepend(typestack,node);
- }
+ }
;
-type2: UNSIGNED integer {
- $<id>$ = g_strconcat("unsigned ",$<id>2,NULL);
- }
- | SIGNED integer {
- $<id>$ = g_strconcat("signed ",$<id>2,NULL);
- }
- | integer {
- $<id>$ = g_strdup($<id>1);
- }
- | UNSIGNED CHAR {
- $<id>$ = g_strdup("unsigned char");
- }
- | SIGNED CHAR {
- $<id>$ = g_strdup("signed char");
- }
- | CHAR {
- $<id>$ = g_strdup("char");
- }
- | DOUBLE {
- $<id>$ = g_strdup("double");
- }
- | FLOAT {
- $<id>$ = g_strdup("float");
- }
- | TOKEN {
+/* The special cases are neccessary to avoid conflicts */
+specifier_list: spec_list {
$<id>$ = $<id>1;
- }
- | tspecifier TOKEN {
- $<id>$ = g_strconcat($<id>1,$<id>2,NULL);
- g_free($<id>2);
- }
- | TYPETOKEN {
+ }
+ | TOKEN {
$<id>$ = $<id>1;
- }
- | VOID {
- $<id>$ = g_strdup("void");
- }
+ }
+ | CONST TOKEN {
+ $<id>$ = g_strconcat("const ", $<id>2, NULL);
+ g_free($<id>2);
+ }
+ | TOKEN CONST {
+ $<id>$ = g_strconcat($<id>1, " const", NULL);
+ g_free($<id>1);
+ }
+ | strunionenum TOKEN {
+ $<id>$ = g_strconcat($<id>1, " ", $<id>2, NULL);
+ g_free($<id>2);
+ }
+ | CONST strunionenum TOKEN {
+ $<id>$ = g_strconcat("const ", $<id>2, " ",
+ $<id>3, NULL);
+ g_free($<id>3);
+ }
+ | strunionenum TOKEN CONST {
+ $<id>$ = g_strconcat($<id>1, " ",
+ $<id>2, " const", NULL);
+ g_free($<id>2);
+ }
;
-integer: LONG INT {
- $<id>$ = "long int";
- }
- | LONG {
- $<id>$ = "long";
- }
- | SHORT INT {
- $<id>$ = "short int";
- }
- | SHORT {
- $<id>$ = "short";
- }
- | INT {
- $<id>$ = "int";
- }
+/* The special const cases take care of conflicts ! */
+spec_list: specifier spec_list {
+ $<id>$ = g_strconcat($<id>1, " ", $<id>2, NULL);
+ g_free($<id>2);
+ }
+ | TYPETOKEN spec_list {
+ $<id>$ = g_strconcat($<id>1, " ", $<id>2, NULL);
+ g_free($<id>1);
+ g_free($<id>2);
+ }
+ | CONST spec_list {
+ $<id>$ = g_strconcat("const ", $<id>2, NULL);
+ g_free($<id>2);
+ }
+ | TYPETOKEN {
+ $<id>$ = $<id>1;
+ }
+ | TYPETOKEN CONST {
+ $<id>$ = g_strconcat($<id>1, " const", NULL);
+ g_free($<id>1);
+ }
+ | specifier {
+ $<id>$ = g_strdup($<id>1);
+ }
+ | specifier CONST {
+ $<id>$ = g_strconcat($<id>1, " const", NULL);
+ }
;
-
-tspecifier: ENUM {
- $<id>$ = "enum ";
- }
- | UNION {
- $<id>$ = "union ";
- }
- | STRUCT {
- $<id>$ = "struct ";
- }
+
+specifier: VOID { $<id>$ = "void"; }
+ | CHAR { $<id>$ = "char"; }
+ | SHORT { $<id>$ = "short"; }
+ | INT { $<id>$ = "int"; }
+ | LONG { $<id>$ = "long"; }
+ | FLOAT { $<id>$ = "float"; }
+ | DOUBLE { $<id>$ = "double"; }
+ | SIGNED { $<id>$ = "signed"; }
+ | UNSIGNED { $<id>$ = "unsigned"; }
+ ;
+
+strunionenum: STRUCT { $<id>$ = "struct"; }
+ | UNION { $<id>$ = "union"; }
+ | ENUM { $<id>$ = "enum"; }
;
-
-stars: '*' stars { stars++; }
- | '*' { stars++; }
+
+pointer: '*' { $<id>$ = g_strdup("*"); }
+ | '*' CONST { $<id>$ = g_strdup("* const"); }
+ | '*' pointer {
+ $<id>$ = g_strconcat("*", $<id>2, NULL);
+ g_free($<id>2);
+ }
+ | '*' CONST pointer {
+ $<id>$ = g_strconcat("* const", $<id>3, NULL);
+ g_free($<id>3);
+ }
;
/* this never sets the_scope */
projects / gob-dx.git / blobdiff