[Gd-chatter] r10858 - in trunk/src/d2c: compiler/convert runtime/melange
gabor at gwydiondylan.org
gabor at gwydiondylan.org
Mon Aug 21 21:52:12 CEST 2006
Author: gabor
Date: Mon Aug 21 21:52:09 2006
New Revision: 10858
Modified:
trunk/src/d2c/compiler/convert/defclass.dylan
trunk/src/d2c/runtime/melange/exports.dylan
trunk/src/d2c/runtime/melange/melange.dylan
Log:
job: minor
* cleanups and indenting
* copyright years
Modified: trunk/src/d2c/compiler/convert/defclass.dylan
==============================================================================
--- trunk/src/d2c/compiler/convert/defclass.dylan (original)
+++ trunk/src/d2c/compiler/convert/defclass.dylan Mon Aug 21 21:52:09 2006
@@ -7,7 +7,7 @@
//======================================================================
//
// Copyright (c) 1995, 1996, 1997 Carnegie Mellon University
-// Copyright (c) 1998 - 2005 Gwydion Dylan Maintainers
+// Copyright (c) 1998 - 2006 Gwydion Dylan Maintainers
// All rights reserved.
//
// Use and copying of this software and preparation of derivative
@@ -1977,38 +1977,38 @@
end method update-indirect-slot;
local method convert-init-entities(info, getter, slot-specifier, make-init-value-var :: <function>, type)
- => (init-value-var, init-function-leaf);
+ => (init-value-var, init-function-leaf);
- let init-value = info.slot-init-value;
- let init-function = info.slot-init-function;
- if (init-value == #t)
- let var = make-init-value-var();
- fer-convert(evals-builder, slot-specifier.slot-definition-init-value,
- lexenv, #"assignment", var);
- build-assignment
- (evals-builder, policy, source, #(),
- make-unknown-call
- (evals-builder,
- ref-dylan-defn(evals-builder, policy, source,
- #"slot-init-value-setter"),
- #f,
- list(var, make-literal-constant(evals-builder, info))));
- var;
- elseif (init-function == #t)
- let leaf = convert-init-function(evals-builder, getter,
- slot-specifier.slot-definition-init-function,
- type, tlf);
- build-assignment
- (evals-builder, policy, source, #(),
- make-unknown-call
- (evals-builder,
- ref-dylan-defn(evals-builder, policy, source,
- #"slot-init-function-setter"),
- #f,
- list(leaf, make-literal-constant(evals-builder, info))));
- values(#f, leaf);
- end if;
- end method convert-init-entities;
+ let init-value = info.slot-init-value;
+ let init-function = info.slot-init-function;
+ if (init-value == #t)
+ let var = make-init-value-var();
+ fer-convert(evals-builder, slot-specifier.slot-definition-init-value,
+ lexenv, #"assignment", var);
+ build-assignment
+ (evals-builder, policy, source, #(),
+ make-unknown-call
+ (evals-builder,
+ ref-dylan-defn(evals-builder, policy, source,
+ #"slot-init-value-setter"),
+ #f,
+ list(var, make-literal-constant(evals-builder, info))));
+ var;
+ elseif (init-function == #t)
+ let leaf = convert-init-function(evals-builder, getter,
+ slot-specifier.slot-definition-init-function,
+ type, tlf);
+ build-assignment
+ (evals-builder, policy, source, #(),
+ make-unknown-call
+ (evals-builder,
+ ref-dylan-defn(evals-builder, policy, source,
+ #"slot-init-function-setter"),
+ #f,
+ list(leaf, make-literal-constant(evals-builder, info))));
+ values(#f, leaf);
+ end if;
+ end method convert-init-entities;
for (slot-defn in defn.class-defn-slots,
Modified: trunk/src/d2c/runtime/melange/exports.dylan
==============================================================================
--- trunk/src/d2c/runtime/melange/exports.dylan (original)
+++ trunk/src/d2c/runtime/melange/exports.dylan Mon Aug 21 21:52:09 2006
@@ -3,7 +3,7 @@
//======================================================================
//
// Copyright (c) 1995, 1996, 1997 Carnegie Mellon University
-// Copyright (c) 1998 - 2004 Gwydion Dylan Maintainers
+// Copyright (c) 1998 - 2006 Gwydion Dylan Maintainers
// All rights reserved.
//
// Use and copying of this software and preparation of derivative
@@ -39,12 +39,11 @@
c-expr, c-struct-field, c-struct-field-setter,
callback-method, callback-entry};
- use magic, exclude: {\without-bounds-checks };
+ use magic, exclude: { \without-bounds-checks };
use machine-words;
export
- //c-variable-ref, c-variable-ref-setter, // deprecated for new work, will be removed soon
- c-variable, c-variable-setter, // use these for development
+ c-variable, c-variable-setter,
<statically-typed-pointer>, raw-value, $null-pointer,
signed-byte-at, signed-byte-at-setter,
unsigned-byte-at, unsigned-byte-at-setter, signed-short-at,
Modified: trunk/src/d2c/runtime/melange/melange.dylan
==============================================================================
--- trunk/src/d2c/runtime/melange/melange.dylan (original)
+++ trunk/src/d2c/runtime/melange/melange.dylan Mon Aug 21 21:52:09 2006
@@ -3,7 +3,7 @@
//======================================================================
//
// Copyright (c) 1994 Carnegie Mellon University
-// Copyright (c) 1998 - 2004 Gwydion Dylan Maintainers
+// Copyright (c) 1998 - 2006 Gwydion Dylan Maintainers
// All rights reserved.
//
// Use and copying of this software and preparation of derivative
@@ -52,29 +52,6 @@
c-expr(ptr: ?expression), 0) }
end;
-/*
-// Usage: c-variable-ref(int: "&variable") { := expression }
-// implementation same as above but this spelling is deprecated
-// and will be wiped soon
-//
-define macro c-variable-ref
- { c-variable-ref (?result-type:expression, ?:expression) }
- => { pointer-deref(?result-type, c-expr(ptr: ?expression), 0) }
- { c-variable-ref (?result-type:token ?:expression) }
- => { pointer-deref(?result-type, c-expr(ptr: ?expression), 0) }
-end;
-
-define macro c-variable-ref-setter
- { c-variable-ref-setter (?value:expression, ?result-type:expression, ?:expression) }
- => { pointer-deref-setter(?value, ?result-type,
- c-expr(ptr: ?expression), 0) }
- { c-variable-ref-setter (?value:expression, ?result-type:token ?:expression) }
- => { pointer-deref-setter(?value, ?result-type,
- c-expr(ptr: ?expression), 0) }
-end;
-// deprecated end /////////////////////////////////////////////
-*/
-
define open primary functional class <statically-typed-pointer> (<object>)
slot raw-value :: <raw-pointer>, required-init-keyword: #"pointer";
end class;
@@ -523,6 +500,7 @@
end method empty?;
define constant space-byte = as(<integer>, ' ');
+
define sealed method size-setter (value :: <integer>, string :: <c-string>)
=> value :: <integer>;
let sz = string.size;
More information about the chatter
mailing list