Skip to content

Commit

Permalink
Merge branch 'pharo-10' into fixUnusedExpressionHandleComment
Browse files Browse the repository at this point in the history
  • Loading branch information
RenaudFondeur committed Aug 14, 2024
2 parents dea0ed9 + d9e7e20 commit 9320b5d
Show file tree
Hide file tree
Showing 85 changed files with 2,753 additions and 1,436 deletions.
3 changes: 1 addition & 2 deletions extracted/plugins/B2DPlugin/src/common/B2DPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -13643,7 +13643,6 @@ stepToNextWideBezierInat(sqInt bezier, sqInt yValue)
updateData[GBUpdateY] = lastY;
updateData[GBUpdateDX] = fwDx;
updateData[GBUpdateDY] = fwDy;
((signed)lastX >> 8);
}
else {

Expand Down Expand Up @@ -13673,7 +13672,7 @@ stepToNextWideBezierInat(sqInt bezier, sqInt yValue)
updateData1[GBUpdateY] = lastY1;
updateData1[GBUpdateDX] = fwDx1;
updateData1[GBUpdateDY] = fwDy1;
((signed)lastX1 >> 8);

computeFinalWideBezierValueswidth(bezier, lineWidth);
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4887,7 +4887,7 @@ transientCStringFromString(sqInt aString)

/* Point to the actual C string. */
cString = arrayValueOf(newString);
(char *)strncpy(cString, stringPtr, len);
strncpy(cString, stringPtr, len);
cString[len] = 0;
return cString;
}
Expand Down
10 changes: 6 additions & 4 deletions smalltalksrc/BaselineOfVMMaker/BaselineOfVMMaker.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ BaselineOfVMMaker >> baseline: spec [
package: 'Slang' with: [
spec requires: #( 'CAST' )
];
package: 'Slang-Tests' with: [
spec requires: #('Slang') ].

"Melchor is a VM-oriented Slang"
spec package: 'Melchor' with: [
spec requires: #('Slang' 'Slang-Tests') ].
package: 'Melchor' with: [
spec requires: #('Slang') ];

package: 'Slang-Tests' with: [
spec requires: #('Slang' 'Melchor') ].


"External Dependencies"
spec baseline: 'SmaCC-GLR' with: [
Expand Down
52 changes: 27 additions & 25 deletions smalltalksrc/CAST/CASTEqualityTests.class.st
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
Class {
#name : #CASTEqualityTests,
#superclass : #TestCase,
#category : #'CAST-Tests'
#name : 'CASTEqualityTests',
#superclass : 'TestCase',
#category : 'CAST-Tests',
#package : 'CAST',
#tag : 'Tests'
}

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testArrayDeclaratorNodeEquality [

self
assert: (CArrayDeclaratorNode identifier: 'aLiteralArray')
equals: (CArrayDeclaratorNode identifier: 'aLiteralArray')
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testArrayDeclaratorNodeInEquality [

self
deny: (CArrayDeclaratorNode identifier: 'aLiteralArray')
equals: (CArrayDeclaratorNode identifier: 'toto')
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeDefaultOperatorInEquality [

self
Expand All @@ -33,7 +35,7 @@ CASTEqualityTests >> testAssignmentNodeDefaultOperatorInEquality [
rvalue: (CConstantNode value: 2))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeEquality [

self
Expand All @@ -45,7 +47,7 @@ CASTEqualityTests >> testAssignmentNodeEquality [
rvalue: (CConstantNode value: 2))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeLvalueInEquality [

self
Expand All @@ -57,7 +59,7 @@ CASTEqualityTests >> testAssignmentNodeLvalueInEquality [
rvalue: (CConstantNode value: 2))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeRvalueInEquality [

self
Expand All @@ -69,7 +71,7 @@ CASTEqualityTests >> testAssignmentNodeRvalueInEquality [
rvalue: (CConstantNode value: 3))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeWithSpecialAndDefaultOperatorEquality [

self
Expand All @@ -82,7 +84,7 @@ CASTEqualityTests >> testAssignmentNodeWithSpecialAndDefaultOperatorEquality [
rvalue: (CConstantNode value: 2))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorEquality [

self
Expand All @@ -96,7 +98,7 @@ CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorEquality [
rvalue: (CConstantNode value: 2))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorLvalueInEquality [

self
Expand All @@ -110,7 +112,7 @@ CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorLvalueInEquality [
rvalue: (CConstantNode value: 2))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorOperatorInEquality [

self
Expand All @@ -124,7 +126,7 @@ CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorOperatorInEquality [
rvalue: (CConstantNode value: 3))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorRvalueInEquality [

self
Expand All @@ -138,55 +140,55 @@ CASTEqualityTests >> testAssignmentNodeWithSpecialOperatorRvalueInEquality [
rvalue: (CConstantNode value: 3))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testConstantNodeEquality [

self
assert: (CConstantNode value: 1)
equals: (CConstantNode value: 1)
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testConstantNodeInEquality [

self
deny: (CConstantNode value: 1)
equals: (CConstantNode value: 2)
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testGoToEquality [

self
assert: (CGotoStatementNode identifier: 'toto')
equals: (CGotoStatementNode identifier: 'toto')
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testGoToInequality [

self
deny: (CGotoStatementNode identifier: 'tata')
equals: (CGotoStatementNode identifier: 'toto')
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testIdentifierNodeEquality [

self
assert: (CIdentifierNode name: 'toto')
equals: (CIdentifierNode name: 'toto')
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testIdentifierNodeInEquality [

self
deny: (CIdentifierNode name: 'toto')
equals: (CIdentifierNode name: 'toto2')
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testInitDeclaratorNodeEquality [

self
Expand All @@ -198,7 +200,7 @@ CASTEqualityTests >> testInitDeclaratorNodeEquality [
initializer: (CConstantNode value: '1'))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testInitDeclaratorNodeWithDeclaratorInEquality [

self
Expand All @@ -210,7 +212,7 @@ CASTEqualityTests >> testInitDeclaratorNodeWithDeclaratorInEquality [
initializer: (CConstantNode value: '1'))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testInitDeclaratorNodeWithInitializerInEquality [

self
Expand All @@ -222,15 +224,15 @@ CASTEqualityTests >> testInitDeclaratorNodeWithInitializerInEquality [
initializer: (CConstantNode value: '2'))
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testInitializerNodeEquality [

self
assert: (CGLRInitializerNode initializers: { CConstantNode value: 1 })
equals: (CGLRInitializerNode initializers: { CConstantNode value: 1 })
]

{ #category : #tests }
{ #category : 'tests' }
CASTEqualityTests >> testInitializerNodeInEquality [

self
Expand Down
Loading

0 comments on commit 9320b5d

Please sign in to comment.