diff --git a/collects/typed-racket/optimizer/tool/mzc.rkt b/collects/typed-racket/optimizer/tool/mzc.rkt index ac40b861e0..34712cec49 100644 --- a/collects/typed-racket/optimizer/tool/mzc.rkt +++ b/collects/typed-racket/optimizer/tool/mzc.rkt @@ -61,7 +61,7 @@ ;; maybe full path info: path, line, col, name ;; path allows `:' as the second character (and first, but not a problem) ;; to support absolute windows paths (e.g. C:\...) - "( in: (([^ :]?[^ ]?[^ :]+):([^ :]+):([^ :]+): )?([^ ]+))?" + "( in: (([^ :]?[^ ]?[^:]+):([^ :]+):([^ :]+): )?([^ ]+))?" ;; maybe module info, useless to us (at least for now) "( in module: [^ ]+)?") " size: ([^ ]+) threshold: ([^ ]+)" @@ -254,8 +254,8 @@ (define (parse l) (regexp-match inlining-event-regexp l)) ;; Windows path - (check-equal? (parse "mzc optimizer: no inlining, out of fuel: involving: #(.../private/map.rkt:22:14 # 22 14 620 335 #t) in: C:\\Users\\bernardip\\Documents\\Scheme\\fotografia.rkt:23:0: prova2 in module: 'anonymous-module size: 55 threshold: 8") - '("mzc optimizer: no inlining, out of fuel: involving: #(.../private/map.rkt:22:14 # 22 14 620 335 #t) in: C:\\Users\\bernardip\\Documents\\Scheme\\fotografia.rkt:23:0: prova2 in module: 'anonymous-module size: 55 threshold: 8" + (check-equal? (parse "optimizer: no inlining, out of fuel: involving: #(.../private/map.rkt:22:14 # 22 14 620 335 #t) in: C:\\Users\\bernardip\\Documents\\Scheme\\fotografia.rkt:23:0: prova2 in module: 'anonymous-module size: 55 threshold: 8") + '("optimizer: no inlining, out of fuel: involving: #(.../private/map.rkt:22:14 # 22 14 620 335 #t) in: C:\\Users\\bernardip\\Documents\\Scheme\\fotografia.rkt:23:0: prova2 in module: 'anonymous-module size: 55 threshold: 8" "no inlining, out of fuel: " "#(.../private/map.rkt:22:14 # 22 14 620 335 #t)" ".../private/map.rkt:22:14" @@ -277,8 +277,8 @@ "55" "8")) - (check-equal? (parse "mzc optimizer: no inlining, out of fuel: involving: #(sqr # 35 2 838 93 #f) in: /home/stamourv/src/examples/example-shapes.rkt:41:0: inC in module: 'example-shapes size: 21 threshold: 6") - '("mzc optimizer: no inlining, out of fuel: involving: #(sqr # 35 2 838 93 #f) in: /home/stamourv/src/examples/example-shapes.rkt:41:0: inC in module: 'example-shapes size: 21 threshold: 6" + (check-equal? (parse "optimizer: no inlining, out of fuel: involving: #(sqr # 35 2 838 93 #f) in: /home/stamourv/src/examples/example-shapes.rkt:41:0: inC in module: 'example-shapes size: 21 threshold: 6") + '("optimizer: no inlining, out of fuel: involving: #(sqr # 35 2 838 93 #f) in: /home/stamourv/src/examples/example-shapes.rkt:41:0: inC in module: 'example-shapes size: 21 threshold: 6" "no inlining, out of fuel: " "#(sqr # 35 2 838 93 #f)" "sqr" @@ -300,8 +300,8 @@ "21" "6")) - (check-equal? (parse "mzc optimizer: inlining: involving: #(inC # 41 0 993 165 #f) in: /home/stamourv/src/examples/example-shapes.rkt:27:0: in in module: 'example-shapes size: 41 threshold: 128") - '("mzc optimizer: inlining: involving: #(inC # 41 0 993 165 #f) in: /home/stamourv/src/examples/example-shapes.rkt:27:0: in in module: 'example-shapes size: 41 threshold: 128" + (check-equal? (parse "optimizer: inlining: involving: #(inC # 41 0 993 165 #f) in: /home/stamourv/src/examples/example-shapes.rkt:27:0: in in module: 'example-shapes size: 41 threshold: 128") + '("optimizer: inlining: involving: #(inC # 41 0 993 165 #f) in: /home/stamourv/src/examples/example-shapes.rkt:27:0: in in module: 'example-shapes size: 41 threshold: 128" "inlining: " "#(inC # 41 0 993 165 #f)" "inC" @@ -321,4 +321,26 @@ "in" " in module: 'example-shapes" "41" - "128"))) + "128")) + (check-equal? (parse "optimizer: no inlining, out of fuel: involving: #(sqr # 35 2 838 93 #f) in: /Users/user/Desktop/Optimization Coach/example-shapes.rkt:41:0: inC in module: 'anonymous-module size: 21 threshold: 6") + '("optimizer: no inlining, out of fuel: involving: #(sqr # 35 2 838 93 #f) in: /Users/user/Desktop/Optimization Coach/example-shapes.rkt:41:0: inC in module: 'anonymous-module size: 21 threshold: 6" + "no inlining, out of fuel: " + "#(sqr # 35 2 838 93 #f)" + "sqr" + "#" + "/Applications/Racket v5.3/collects/racket/math.rkt" + #f + "35" + "2" + "838" + "93" + #f + " in: /Users/user/Desktop/Optimization Coach/example-shapes.rkt:41:0: inC" + "/Users/user/Desktop/Optimization Coach/example-shapes.rkt:41:0: " + "/Users/user/Desktop/Optimization Coach/example-shapes.rkt" + "41" + "0" + "inC" + " in module: 'anonymous-module" + "21" + "6")))