@@ -441,13 +441,10 @@ public abstract static class GetItemNode extends NormalizingNode {
441
441
442
442
@ Child private GetItemScalarNode getItemScalarNode ;
443
443
@ Child private GetItemSliceNode getItemSliceNode ;
444
- @ Child private PRaiseNode raiseNode ;
445
- private final TruffleString keyTypeErrorMessage ;
446
444
private final BiFunction <SequenceStorage , PythonObjectFactory , Object > factoryMethod ;
447
445
448
- public GetItemNode (NormalizeIndexNode normalizeIndexNode , TruffleString keyTypeErrorMessage , BiFunction <SequenceStorage , PythonObjectFactory , Object > factoryMethod ) {
446
+ public GetItemNode (NormalizeIndexNode normalizeIndexNode , BiFunction <SequenceStorage , PythonObjectFactory , Object > factoryMethod ) {
449
447
super (normalizeIndexNode );
450
- this .keyTypeErrorMessage = keyTypeErrorMessage ;
451
448
this .factoryMethod = factoryMethod ;
452
449
}
453
450
@@ -499,11 +496,6 @@ protected Object doSlice(VirtualFrame frame, SequenceStorage storage, PSlice sli
499
496
throw new IllegalStateException ();
500
497
}
501
498
502
- @ Fallback
503
- protected Object doInvalidKey (@ SuppressWarnings ("unused" ) SequenceStorage storage , Object key ) {
504
- throw ensureRaiseNode ().raise (TypeError , keyTypeErrorMessage , key );
505
- }
506
-
507
499
private GetItemScalarNode getGetItemScalarNode () {
508
500
if (getItemScalarNode == null ) {
509
501
CompilerDirectives .transferToInterpreterAndInvalidate ();
@@ -520,44 +512,20 @@ private GetItemSliceNode getGetItemSliceNode() {
520
512
return getItemSliceNode ;
521
513
}
522
514
523
- private PRaiseNode ensureRaiseNode () {
524
- if (raiseNode == null ) {
525
- CompilerDirectives .transferToInterpreterAndInvalidate ();
526
- raiseNode = insert (PRaiseNode .create ());
527
- }
528
- return raiseNode ;
529
- }
530
-
531
515
public static GetItemNode createNotNormalized () {
532
- return GetItemNodeGen .create (null , ErrorMessages . OBJ_INDEX_MUST_BE_INT_OR_SLICES , null );
516
+ return GetItemNodeGen .create (null , null );
533
517
}
534
518
535
519
public static GetItemNode create (NormalizeIndexNode normalizeIndexNode ) {
536
- return GetItemNodeGen .create (normalizeIndexNode , ErrorMessages . OBJ_INDEX_MUST_BE_INT_OR_SLICES , null );
520
+ return GetItemNodeGen .create (normalizeIndexNode , null );
537
521
}
538
522
539
523
public static GetItemNode create () {
540
- return GetItemNodeGen .create (NormalizeIndexNode .create (), ErrorMessages .OBJ_INDEX_MUST_BE_INT_OR_SLICES , null );
541
- }
542
-
543
- public static GetItemNode createNotNormalized (TruffleString keyTypeErrorMessage ) {
544
- return GetItemNodeGen .create (null , keyTypeErrorMessage , null );
545
- }
546
-
547
- public static GetItemNode create (NormalizeIndexNode normalizeIndexNode , TruffleString keyTypeErrorMessage ) {
548
- return GetItemNodeGen .create (normalizeIndexNode , keyTypeErrorMessage , null );
549
- }
550
-
551
- public static GetItemNode create (TruffleString keyTypeErrorMessage ) {
552
- return GetItemNodeGen .create (NormalizeIndexNode .create (), keyTypeErrorMessage , null );
553
- }
554
-
555
- public static GetItemNode create (NormalizeIndexNode normalizeIndexNode , TruffleString keyTypeErrorMessage , BiFunction <SequenceStorage , PythonObjectFactory , Object > factoryMethod ) {
556
- return GetItemNodeGen .create (normalizeIndexNode , keyTypeErrorMessage , factoryMethod );
524
+ return GetItemNodeGen .create (NormalizeIndexNode .create (), null );
557
525
}
558
526
559
527
public static GetItemNode create (NormalizeIndexNode normalizeIndexNode , BiFunction <SequenceStorage , PythonObjectFactory , Object > factoryMethod ) {
560
- return GetItemNodeGen .create (normalizeIndexNode , ErrorMessages . OBJ_INDEX_MUST_BE_INT_OR_SLICES , factoryMethod );
528
+ return GetItemNodeGen .create (normalizeIndexNode , factoryMethod );
561
529
}
562
530
563
531
}
0 commit comments