[Gd-chatter] r11324 - branches/opendylan-melange/melange

[hannes at gwydiondylan.org]

Author: hannes
Date: Sat May  5 03:56:53 2007
New Revision: 11324

Modified:
   branches/opendylan-melange/melange/c-parse.input
   branches/opendylan-melange/melange/linux-c-decl.lid
   branches/opendylan-melange/melange/linux-portability.dylan
Log:
Job: fd
fix c-parse.input to work with opendylan [this was fixed
multiple times in c-parse.dylan at andreas and my machine,
now in c-parse.input].
fix melange to work on linux with opendylan


Modified: branches/opendylan-melange/melange/c-parse.input
==============================================================================
--- branches/opendylan-melange/melange/c-parse.input	(original)
+++ branches/opendylan-melange/melange/c-parse.input	Sat May  5 03:56:53 2007
@@ -86,7 +86,7 @@
 //
 define generic int-value (value :: <object>, state :: <parse-state>);
 
-define method int-value (value :: <abstract-integer>, state :: <parse-state>)
+define method int-value (value :: <integer>, state :: <parse-state>)
   value;
 end method;
 
@@ -520,12 +520,12 @@
 
 cast-expr (<lparen-token> type-name <rparen-token> cast-expr)
   let result = int-value(%4, @0);
-  if (instance?(result, <abstract-integer>)
+  if (instance?(result, <integer>)
         & instance?(%2.true-type, <integer-type-declaration>))
     // Handle casting a large unsigned value to a signed integer type.
     if (instance?(%2.true-type, <signed-integer-type-declaration>)
           & result > (2 ^ (8 * %2.type-size-slot - 1) - 1))
-      as(<integer>, result - as(<extended-integer>, 2) ^ (8 * %2.type-size-slot))
+      as(<integer>, result - as(<integer>, 2) ^ (8 * %2.type-size-slot))
     else
       result
     end if

Modified: branches/opendylan-melange/melange/linux-c-decl.lid
==============================================================================
--- branches/opendylan-melange/melange/linux-c-decl.lid	(original)
+++ branches/opendylan-melange/melange/linux-c-decl.lid	Sat May  5 03:56:53 2007
@@ -1,16 +1,16 @@
 library: melange-c
 unique-id-base: 10000
 shared-library: no
-
-c-exports.dylan
-source-location.dylan
-parse-conditions.dylan
-multistring.dylan
-c-lexer.dylan
-c-lexer-cpp.dylan
-linux-portability.dylan
-c-parse.dylan
-alignment.dylan
-c-decl-state.dylan
-c-decl-write.dylan
-c-decl.dylan
+Files:	c-exports
+	source-location
+	parse-conditions
+	multistring
+	c-lexer
+	c-lexer-cpp
+	linux-portability
+	c-parse
+	alignment
+	c-decl-state
+	c-decl-write
+	c-decl-write-c-ffi
+	c-decl

Modified: branches/opendylan-melange/melange/linux-portability.dylan
==============================================================================
--- branches/opendylan-melange/melange/linux-portability.dylan	(original)
+++ branches/opendylan-melange/melange/linux-portability.dylan	Sat May  5 03:56:53 2007
@@ -84,7 +84,7 @@
       "__builtin_va_list", "void*"];
   
 define constant linux-include-directories
-  = #["/usr/include"];
+  = #["/usr/include", "/usr/lib/gcc/i486-linux-gnu/4.0.3/include/", "/usr/include/linux", "/usr/include/gtk-2.0", "/usr/lib/gtk-2.0/include",  "/usr/include/atk-1.0", "/usr/include/cairo",  "/usr/include/pango-1.0", "/usr/include/glib-2.0",  "/usr/lib/glib-2.0/include"];
 
 for (dir in linux-include-directories)
   push-last(include-path, dir);