Changeset 14715 in project for chicken


Ignore:
Timestamp:
05/20/09 15:28:02 (11 years ago)
Author:
felix winkelmann
Message:

fixes in types.db and scrutinizer

Location:
chicken/branches/scrutiny
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • chicken/branches/scrutiny/rules.make

    r14652 r14715  
    12401240endif
    12411241
    1242 clean:
     1242clean: scrutiny-clean
    12431243        -$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) chicken$(EXE) csi$(EXE) csc$(EXE) \
    12441244          chicken-profile$(EXE) csi-static$(EXE) \
     
    12501250          $(LIBCHICKENGUI_IMPORT_LIBRARY)  \
    12511251          $(MSVC_CHICKEN_EXPORT_FILES) $(CLEAN_MINGW_LIBS) \
    1252           $(CLEAN_MANIFESTS) *.scrutiny[12]
     1252          $(CLEAN_MANIFESTS)
    12531253
    12541254confclean:
     
    13321332# scrutiny
    13331333
    1334 .PHONY: scrutiny
     1334.PHONY: scrutiny scrutiny-clean
    13351335
    13361336scrutiny: $(SCRUTINIZED_LIBRARIES:=.scrutiny1) $(COMPILER_OBJECTS_1:=.scrutiny2)
     
    13411341%.scrutiny2: $(SRCDIR)%.scm
    13421342        $(XCHICKEN) $< $(CHICKEN_SCRUTINY_OPTIONS) $(CHICKEN_COMPILER_OPTIONS) 2>&1 | tee $@
     1343
     1344scrutiny-clean:
     1345        rm *.scrutiny[12]
  • chicken/branches/scrutiny/scrutinizer.scm

    r14711 r14715  
    132132          (else '*)))
    133133  (define (variable-result id e loc)
    134     (cond #;((and (get db id 'assigned)
     134    (cond ((and (get db id 'assigned)
    135135                (not (##sys#get id '##core#declared-type)) )
    136136           '*)
     
    303303          ((eq? t1 'noreturn))
    304304          ((eq? t2 'noreturn))
    305           ((eq? t1 'number) (memq t2 '(number fixnum float)))
    306           ((eq? t2 'number) (memq t1 '(number fixnum float)))
     305          ((and (eq? t1 'number) (memq t2 '(number fixnum float))))
     306          ((and (eq? t2 'number) (memq t1 '(number fixnum float))))
    307307          ((eq? 'procedure t1) (and (pair? t2) (eq? 'procedure (car t2))))
    308308          ((eq? 'procedure t2) (and (pair? t1) (eq? 'procedure (car t1))))
     
    582582                                        #f)))
    583583                          (if (eq? r '*)
    584                               '(*)
     584                              '*
    585585                              r)))))))
    586586               ((set! ##core#set!)
  • chicken/branches/scrutiny/types.db

    r14711 r14715  
    219219(denominator (procedure denominator (number) number))
    220220(scheme-report-environment (procedure scheme-report-environment (#!optional fixnum) *))
    221 (null-environment (procedure null-environment () *))
     221(null-environment (procedure null-environment (#!optional fixnum) *))
    222222(interaction-environment (procedure interaction-environment () *))
    223223
     
    342342(make-composite-condition (procedure make-composite-condition (#!rest (struct condition)) (struct condition)))
    343343(make-parameter (procedure make-parameter (* #!optional procedure) procedure))
    344 (make-property-condition (procedure make-property-condition (symbol #!rest symbol) (struct condition)))
     344(make-property-condition (procedure make-property-condition (symbol #!rest *) (struct condition)))
    345345(maximum-flonum float)
    346346(memory-statistics (procedure memory-statistics () vector))
     
    348348(most-negative-fixnum fixnum)
    349349(most-positive-fixnum fixnum)
    350 (on-exit (procedure on-exit (procedure () . *) undefined))
     350(on-exit (procedure on-exit ((procedure () . *)) undefined))
    351351(open-input-string (procedure open-input-string (string #!rest) port))
    352352(open-output-string (procedure open-output-string (#!rest) port))
     
    368368(repl (procedure repl () undefined))
    369369(repl-prompt (procedure repl-prompt (#!optional procedure) procedure))
    370 (repository-path (procedure repository-path (#!optional string) string))
     370(repository-path (procedure repository-path (#!optional *) string))
    371371(require (procedure require (#!rest *) undefined))
    372372(reset (procedure reset () undefined))
     
    490490;; files
    491491
    492 (delete-file* (procedure delete-file* (string) undefined))
     492(delete-file* (procedure delete-file* (string) boolean))
    493493(file-copy (procedure file-copy (string string #!optional * fixnum) undefined))
    494494(file-move (procedure file-move (string string #!optional * fixnum) undefined))
     
    887887(any (procedure any ((procedure (*) *) list) *))
    888888(append! (procedure append! (#!rest list) list))
    889 (append-map (procedure append-map ((procedure (*) *) list #!rest list) pair))
    890 (append-map! (procedure append-map! ((procedure (*) *) list #!rest list) pair))
     889(append-map (procedure append-map ((procedure (#!rest) *) list #!rest list) pair))
     890(append-map! (procedure append-map! ((procedure (#!rest) *) list #!rest list) pair))
    891891(append-reverse (procedure append-reverse (list list) list))
    892892(append-reverse! (procedure append-reverse! (list list) list))
     
    919919(find-tail (procedure find-tail ((procedure (*) *) list) *))
    920920(first (procedure first (pair) *))
    921 (fold (procedure fold ((procedure (* *) *) * list) *))
    922 (fold-right (procedure fold-right ((procedure (* *) *) list) *))
     921(fold (procedure fold ((procedure (* *) *) * #!rest list) *))
     922(fold-right (procedure fold-right ((procedure (* *) *) #!rest list) *))
    923923(fourth (procedure fourth (pair) *))
    924924(iota (procedure iota (fixnum #!optional fixnum fixnum) list))
     
    930930(list-tabulate (procedure list-tabulate (fixnum (procedure (fixnum) *)) list))
    931931(list= (procedure list= (#!rest list) boolean))
    932 (lset-adjoin (procedure lset-adjoin ((procedure (* *) *) * list) list))
     932(lset-adjoin (procedure lset-adjoin ((procedure (* *) *) list #!rest) list))
    933933(lset-diff+intersection (procedure lset-diff+intersection ((procedure (* *) *) list #!rest list) list))
    934934(lset-diff+intersection! (procedure lset-diff+intersection! ((procedure (* *) *) list #!rest list) list))
     
    951951(pair-fold (procedure pair-fold (procedure * list #!rest list) *))
    952952(pair-fold-right (procedure pair-fold-right (procedure * list #!rest list) *))
    953 (pair-for-each (procedure pair-for-each ((procedure (list) . *) list #!rest list) undefined))
     953(pair-for-each (procedure pair-for-each ((procedure (#!rest) . *) list #!rest list) undefined))
    954954(partition (procedure partition ((procedure (*) *) list) list list))
    955955(partition! (procedure partition! ((procedure (*) *) list) list list))
     
    13231323(hash-table-min-load (procedure hash-table-min-load ((struct hash-table)) fixnum))
    13241324(hash-table-ref (procedure hash-table-ref ((struct hash-table) * #!optional (procedure () *)) *))
    1325 (hash-table-ref/default (procedure hash-table-ref/default ((struct hash-table) * (procedure () *)) *))
     1325(hash-table-ref/default (procedure hash-table-ref/default ((struct hash-table) * *) *))
    13261326(hash-table-remove! (procedure hash-table-remove! ((struct hash-table) (procedure (* *) *)) undefined))
    13271327(hash-table-set! (procedure hash-table-set! ((struct hash-table) * *) undefined))
Note: See TracChangeset for help on using the changeset viewer.