Remove support for --show-insn, and ")set )report insn"

6 files changed, 15 insertions, 40 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 61d7b845..535a5187 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2016-01-31  Gabriel Dos Reis  <gdr@axiomatics.org>
+
+	Breaking change from previous version: No more support for command
+	line --show-insn option, and library compiler ")set )report" option.
+	* interp/g-opt.boot (optimizeFunctionDef): Remove reference to
+	$reportOptimization. 
+	* interp/g-timer.boot (timedOptimization): Likewise.
+	* interp/i-syscmd.boot (compileSpad2Cmd): Likewise.
+	($setOptions): Remove support for ")report".
+	* interp/sys-driver.boot (initializeGlobalState): Likewise.
+
 2016-01-17  Gabriel Dos Reis  <gdr@axiomatics.org>
 
 	* interp/daase.lisp (GETDATABASE): Remove PARENTS case.
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index 453c972e..76f629f6 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2015, Gabriel Dos Reis.
+-- Copyright (C) 2007-2016, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -416,16 +416,7 @@ optimize x ==
   optimize! copyTree x
 
 optimizeFunctionDef(def) ==
-  if $reportOptimization then
-    sayBrightlyI bright '"Original LISP code:"
-    pp def
- 
-  expr := optimize! copyTree second def
- 
-  if $reportOptimization then
-    sayBrightlyI bright '"Intermediate VM code:"
-    pp expr
-
+  expr := optimize second def
   [first def,expr]
 
 resetTo(x,y) ==
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 6604567f..31aad0b9 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2012, Gabriel Dos Reis.
+-- Copyright (C) 2007-2016, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -247,9 +247,6 @@ timedOptimization(code) ==
   startTimingProcess 'optimization
   $getDomainCode : local := nil
   r := simplifyVMForm code
-  if $reportOptimization then
-    sayBrightlyI bright '"Optimized intermediate code:"
-    pp r
   stopTimingProcess 'optimization
   r
  
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 13553c3b..6e137e16 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2013, Gabriel Dos Reis.
+-- Copyright (C) 2007-2016, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -575,10 +575,6 @@ compileSpad2Cmd args ==
             fun.0       := 'c
             constructor := [unabbrev o for o in optargs]
         fullopt is "optimize" => setCompilerOptimizations first optargs
-        fullopt is "report" =>
-           null optargs => throwKeyedMsg("S2IZ0037",['")report"])
-           if "insn" in optargs then
-             $reportOptimization := true
         throwKeyedMsg("S2IZ0036",[strconc('")",object2String optname)])
 
     $InteractiveMode : local := nil
diff --git a/src/interp/setvart.boot b/src/interp/setvart.boot
index 6c078b61..d84b29ec 100644
--- a/src/interp/setvart.boot
+++ b/src/interp/setvart.boot
@@ -1510,25 +1510,6 @@ $setOptions := '(
      (on off)
      off)
 
--- ------------------- The optimization Option -------------------
---
---  Description: show optimized LISP code
---
---  The optimization option may be followed by any one of the 
---  following:
---
---     on
---  -> off 
---
---  The current setting is indicated within the list.
-    (optimization
-     "show optimized LISP code"
-     development
-     LITERALS
-     $reportOptimization
-     (on off)
-     off)
-
 -- ------------------- The prettyprint Option --------------------
 --
 --  Description: prettyprint BOOT func's as they compile
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 010a6bab..4ab20b23 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -203,7 +203,6 @@ initializeGlobalState() ==
   $buildingSystemAlgebra := getOptionValue "system-algebra"
   $verbose := getOptionValue "verbose"
   $bootStrapMode := getOptionValue "bootstrap"
-  $reportOptimization := getOptionValue "show-insn"
   $optimizeRep := getOptionValue "inline-rep"
   setCompilerOptimizations(getOptionValue "optimize" or
                              $defaultOptimizationLevel)