Merge branch 'master' of git://factorcode.org/git/factor

diff --combined basis/debugger/windows/windows.factor
index 188b820788bbc081f77ca851b2941d5940f102ff,0de5c38283a544edc41b66354d83335982abef23..319f100e160bd4f3ab8dd0778d74ff1c4152fd19
mode 100644,100755..100755
--- 1/basis/debugger/windows/windows.factor
--- 2/basis/debugger/windows/windows.factor
+++ b/basis/debugger/windows/windows.factor
@@@ -1,7 -1,7 +1,7 @@@
  ! Copyright (C) 2009 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
- USING: assocs debugger io kernel literals namespaces prettyprint
- sequences system windows.kernel32 ;
+ USING: assocs debugger io kernel literals math.parser namespaces
+ prettyprint sequences system windows.kernel32 ;
  IN: debugger.windows
  
  CONSTANT: seh-names
@@@ -30,13 -30,11 +30,13 @@@
          { $ STATUS_PRIVILEGED_INSTRUCTION     "STATUS_PRIVILEGED_INSTRUCTION"   }
          { $ STATUS_STACK_OVERFLOW             "STATUS_STACK_OVERFLOW"           }
          { $ STATUS_CONTROL_C_EXIT             "STATUS_CONTROL_C_EXIT"           }
 +        { $ STATUS_FLOAT_MULTIPLE_FAULTS      "STATUS_FLOAT_MULTIPLE_FAULTS"    }
 +        { $ STATUS_FLOAT_MULTIPLE_TRAPS       "STATUS_FLOAT_MULTIPLE_TRAPS"     }
      }
  
  : seh-name. ( n -- )
-     seh-names get at [ " (" ")" surround write ] when* ;
+     seh-names at [ " (" ")" surround write ] when* ;
  
  M: windows signal-error.
      "Windows exception 0x" write
-     third [ .h ] [ seh-name. ] bi nl ;
+     third [ >hex write ] [ seh-name. ] bi nl ;