Skip to content

Commit af59582

Browse files
authored
Merge pull request #18644 from guillep/debuginfooptimizations
Add first version of DebugInfo object
2 parents 64468cc + 9be61f7 commit af59582

35 files changed

+2146
-106
lines changed

bootstrap/scripts/4-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" perform --save PharoBootst
153153

154154
# Installing compiler through Hermes
155155
echo $(date -u) "[Compiler] Installing compiler through Hermes"
156-
${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Debugging-Utils.hermes OpalCompiler-Core.hermes CodeImport.hermes CodeImport-Commands.hermes --save --no-fail-on-undeclared
156+
${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Debugging-Utils.hermes OpalCompiler-Core.hermes DebugInfo.hermes CodeImport.hermes CodeImport-Commands.hermes --save --no-fail-on-undeclared
157157
${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" eval --save "OpalCompiler register. OCCompilationContext initialize. OCASTTranslator initialize."
158158
${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" eval --save "SystemEnvironment deprecatedAliases: { #SystemDictionary }." # This line should be removed in Pharo 14 since it is for backward compatibility.
159159
${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" st ${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/01-initialization/01-init.st --no-source --save --quit

src/BaselineOfKernelTests/BaselineOfKernelTests.class.st

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BaselineOfKernelTests >> baseline: spec [
3737
package: 'Jobs-Tests' ;
3838
package: 'AST-Core-Tests';
3939
package: 'OpalCompiler-Tests' with: [ spec requires: #('AST-Core-Tests') ];
40+
package: 'DebugInfo-Tests' with: [ spec requires: #('AST-Core-Tests') ];
4041
package: 'CodeImport-Tests' with: [ spec requires: #('AST-Core-Tests') ];
4142
package: 'Random-Tests';
4243
package: 'Ring-Definitions-Core-Tests';

src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ BaselineOfPharoBootstrap >> baseline: spec [
134134

135135
spec package: 'Debugging-Utils'.
136136
spec package: 'OpalCompiler-Core'.
137+
spec package: 'DebugInfo'
138+
with: [ spec requires: #( 'OpalCompiler-Core' ) ].
137139

138140
spec package: 'FileSystem-Core'.
139141
spec package: 'FileSystem-Disk'.
@@ -206,6 +208,7 @@ BaselineOfPharoBootstrap >> baseline: spec [
206208
'CodeImport'.
207209
'CodeImport-Commands'.
208210
'Debugging-Utils'.
211+
'DebugInfo'.
209212
'OpalCompiler-Core'}.
210213

211214
spec group: 'FileSystemGroup' with: {

src/Calypso-SystemTools-Core/ClyMethodEditorToolMorph.class.st

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,7 @@ ClyMethodEditorToolMorph >> textChanged: aTextChanged [
231231
textMorph segments copy do: #delete.
232232
ast := self currentEditedAST.
233233
IconStyler new
234-
stylerClasses: {
235-
ErrorNodeStyler.
236-
SemanticWarningIconStyler };
234+
stylerClasses: {ErrorNodeStyler. SemanticWarningIconStyler };
237235
styleText: textModel withAst: ast.
238236
^ ast
239237
]

0 commit comments

Comments
 (0)