Re-organize a few things to reduce '-include=' image size
							parent
							
								
									bbedd03f6b
								
							
						
					
					
						commit
						2b142dabae
					
				| 
						 | 
					@ -77,8 +77,6 @@ SYMBOL: bootstrap-time
 | 
				
			||||||
        "stage2: deployment mode" print
 | 
					        "stage2: deployment mode" print
 | 
				
			||||||
    ] [
 | 
					    ] [
 | 
				
			||||||
        "debugger" require
 | 
					        "debugger" require
 | 
				
			||||||
        "inspector" require
 | 
					 | 
				
			||||||
        "tools.errors" require
 | 
					 | 
				
			||||||
        "listener" require
 | 
					        "listener" require
 | 
				
			||||||
        "none" require
 | 
					        "none" require
 | 
				
			||||||
    ] if
 | 
					    ] if
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,8 +2,10 @@ USING: vocabs.loader sequences ;
 | 
				
			||||||
IN: bootstrap.tools
 | 
					IN: bootstrap.tools
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    "editors"
 | 
				
			||||||
    "inspector"
 | 
					    "inspector"
 | 
				
			||||||
    "bootstrap.image"
 | 
					    "bootstrap.image"
 | 
				
			||||||
 | 
					    "see"
 | 
				
			||||||
    "tools.annotations"
 | 
					    "tools.annotations"
 | 
				
			||||||
    "tools.crossref"
 | 
					    "tools.crossref"
 | 
				
			||||||
    "tools.errors"
 | 
					    "tools.errors"
 | 
				
			||||||
| 
						 | 
					@ -19,5 +21,4 @@ IN: bootstrap.tools
 | 
				
			||||||
    "vocabs.hierarchy"
 | 
					    "vocabs.hierarchy"
 | 
				
			||||||
    "vocabs.refresh"
 | 
					    "vocabs.refresh"
 | 
				
			||||||
    "vocabs.refresh.monitor"
 | 
					    "vocabs.refresh.monitor"
 | 
				
			||||||
    "editors"
 | 
					 | 
				
			||||||
} [ require ] each
 | 
					} [ require ] each
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,19 +8,22 @@ continuations.private combinators generic.math classes.builtin classes
 | 
				
			||||||
compiler.units generic.standard generic.single vocabs init
 | 
					compiler.units generic.standard generic.single vocabs init
 | 
				
			||||||
kernel.private io.encodings accessors math.order destructors
 | 
					kernel.private io.encodings accessors math.order destructors
 | 
				
			||||||
source-files parser classes.tuple.parser effects.parser lexer
 | 
					source-files parser classes.tuple.parser effects.parser lexer
 | 
				
			||||||
generic.parser strings.parser vocabs.loader vocabs.parser see
 | 
					generic.parser strings.parser vocabs.loader vocabs.parser
 | 
				
			||||||
source-files.errors ;
 | 
					source-files.errors ;
 | 
				
			||||||
IN: debugger
 | 
					IN: debugger
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GENERIC: error. ( error -- )
 | 
					 | 
				
			||||||
GENERIC: error-help ( error -- topic )
 | 
					GENERIC: error-help ( error -- topic )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
M: object error. . ;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
M: object error-help drop f ;
 | 
					M: object error-help drop f ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
M: tuple error-help class ;
 | 
					M: tuple error-help class ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					M: source-file-error error-help error>> error-help ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					GENERIC: error. ( error -- )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					M: object error. . ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
M: string error. print ;
 | 
					M: string error. print ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: :s ( -- )
 | 
					: :s ( -- )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
USING: assocs hashtables kernel sequences generic words
 | 
					USING: assocs hashtables kernel sequences generic words
 | 
				
			||||||
arrays classes slots slots.private classes.tuple
 | 
					arrays classes slots slots.private classes.tuple
 | 
				
			||||||
classes.tuple.private math vectors math.vectors quotations
 | 
					classes.tuple.private math vectors math.vectors quotations
 | 
				
			||||||
accessors combinators byte-arrays ;
 | 
					accessors combinators byte-arrays vocabs vocabs.loader ;
 | 
				
			||||||
IN: mirrors
 | 
					IN: mirrors
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TUPLE: mirror { object read-only } ;
 | 
					TUPLE: mirror { object read-only } ;
 | 
				
			||||||
| 
						 | 
					@ -59,3 +59,7 @@ M: hashtable make-mirror ;
 | 
				
			||||||
M: integer make-mirror drop f ;
 | 
					M: integer make-mirror drop f ;
 | 
				
			||||||
M: enumerated-sequence make-mirror <enum> ;
 | 
					M: enumerated-sequence make-mirror <enum> ;
 | 
				
			||||||
M: object make-mirror <mirror> ;
 | 
					M: object make-mirror <mirror> ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					"specialized-arrays" vocab [
 | 
				
			||||||
 | 
					    "specialized-arrays.mirrors" require
 | 
				
			||||||
 | 
					] when
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,10 +8,6 @@ IN: tools.errors
 | 
				
			||||||
#! Tools for source-files.errors. Used by tools.tests and others
 | 
					#! Tools for source-files.errors. Used by tools.tests and others
 | 
				
			||||||
#! for error reporting
 | 
					#! for error reporting
 | 
				
			||||||
 | 
					
 | 
				
			||||||
M: source-file-error compute-restarts error>> compute-restarts ;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
M: source-file-error error-help error>> error-help ;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
CONSTANT: +listener-input+ "<Listener input>"
 | 
					CONSTANT: +listener-input+ "<Listener input>"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: error-location ( error -- string )
 | 
					: error-location ( error -- string )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,6 +17,7 @@ TUPLE: source-file-error error asset file line# ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
M: source-file-error error-file [ error>> error-file ] [ file>> ] bi or ;
 | 
					M: source-file-error error-file [ error>> error-file ] [ file>> ] bi or ;
 | 
				
			||||||
M: source-file-error error-line [ error>> error-line ] [ line#>> ] bi or ;
 | 
					M: source-file-error error-line [ error>> error-line ] [ line#>> ] bi or ;
 | 
				
			||||||
 | 
					M: source-file-error compute-restarts error>> compute-restarts ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: sort-errors ( errors -- alist )
 | 
					: sort-errors ( errors -- alist )
 | 
				
			||||||
    [ [ line#>> ] sort-with ] { } assoc-map-as sort-keys ;
 | 
					    [ [ line#>> ] sort-with ] { } assoc-map-as sort-keys ;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue