[Scummvm-cvs-logs] SF.net SVN: scummvm: [27981] tools/branches/gsoc2007-decompiler

[brixxie at users.sourceforge.net]

Revision: 27981
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27981&view=rev
Author:   brixxie
Date:     2007-07-08 16:38:03 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
Removed `between?' utility. Added cfgg.scm skeleton.

Modified Paths:
--------------
    tools/branches/gsoc2007-decompiler/antipasto.scm
    tools/branches/gsoc2007-decompiler/util.scm

Added Paths:
-----------
    tools/branches/gsoc2007-decompiler/cfgg.scm

Property Changed:
----------------
    tools/branches/gsoc2007-decompiler/


Property changes on: tools/branches/gsoc2007-decompiler
___________________________________________________________________
Name: svk:merge
   - 489ca303-0d3d-4dc1-a57d-017c7912a06a:/local/gsoc2007-decompiler:36
   + 489ca303-0d3d-4dc1-a57d-017c7912a06a:/local/gsoc2007-decompiler:38

Modified: tools/branches/gsoc2007-decompiler/antipasto.scm
===================================================================
--- tools/branches/gsoc2007-decompiler/antipasto.scm	2007-07-08 22:13:50 UTC (rev 27980)
+++ tools/branches/gsoc2007-decompiler/antipasto.scm	2007-07-08 23:38:03 UTC (rev 27981)
@@ -2,7 +2,7 @@
 
 ;;; Antipasto - Scumm Script Disassembler Prototype (version 5 scripts)
 ;;; Copyright (C) 2007 Andreas Scholta
-;;; Time-stamp: <2007-07-06 19:46:51 brx>
+;;; Time-stamp: <2007-07-07 01:11:26 brx>
 
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License
@@ -59,7 +59,7 @@
                            accum)))))
 
 (define (register-123-op name base-code handler n)
-  (when (between? n 0 3)
+  (when (<= 0 n 3)
     (for-each (cut register-opcode name <> handler)
               (generate-opcodes base-code
                                 (take (list param-1 param-2 param-3) n)))))

Added: tools/branches/gsoc2007-decompiler/cfgg.scm
===================================================================
--- tools/branches/gsoc2007-decompiler/cfgg.scm	                        (rev 0)
+++ tools/branches/gsoc2007-decompiler/cfgg.scm	2007-07-08 23:38:03 UTC (rev 27981)
@@ -0,0 +1,19 @@
+;;;; cfgg.scm
+
+;;; Antipasto - Scumm Script Disassembler Prototype
+;;; Copyright (C) 2007 Andreas Scholta
+;;; Time-stamp: <2007-07-07 20:06:40 brx>
+
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License
+;;; as published by the Free Software Foundation; either version 2
+;;; of the License, or (at your option) any later version.
+
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.


Property changes on: tools/branches/gsoc2007-decompiler/cfgg.scm
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: tools/branches/gsoc2007-decompiler/util.scm
===================================================================
--- tools/branches/gsoc2007-decompiler/util.scm	2007-07-08 22:13:50 UTC (rev 27980)
+++ tools/branches/gsoc2007-decompiler/util.scm	2007-07-08 23:38:03 UTC (rev 27981)
@@ -1,8 +1,8 @@
 ;;;; util.scm
 
-;;; Antipasto - Scumm Script Disassembler Prototype (version 5 scripts)
+;;; Antipasto - Scumm Script Disassembler Prototype
 ;;; Copyright (C) 2007 Andreas Scholta
-;;; Time-stamp: <2007-07-05 01:03:01 brx>
+;;; Time-stamp: <2007-07-07 01:11:13 brx>
 
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License
@@ -37,22 +37,15 @@
 
 ;;;; num procedures
 
-(define (between? x a b)
-  (and (>= x a) (<= x b)))
-
 (define /= (complement =))
 
 ;;;; list procedures
 
 (define (generate-subsets lis)
-  (let accum-subsets ((lis lis)
-                      (accum '(())))
-    (if (null? lis)
-        accum
-        (accum-subsets (cdr lis)
-                       (append (map (cut cons (car lis) <>)
-                                    accum)
-                               accum)))))
+  (if (null? lis)
+      '(())
+      (let ((ps (generate-subsets (cdr lis))))
+        (append ps (map (cut cons (car lis) <>) ps)))))
 
 ;;;; port reader procedures
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.