WIP Allow lists to be indexed by multiple values

dev/Updates/multi-index

@@ -0,0 +1,29 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Format 'yyyy/mm/dd'
+!! Date
+2015/03/18
+!! Changed by
+SL
+! Reported by
+
+!! Type of Change
+New: extended functionality
+
+!! Description
+
+Kernel support for accessing lists using multiple indices.
+This doesn't do anything by itself but allows library or packages
+to install methods supporting expressions like
+m[1,2];
+m[1,2,3] := x;
+IsBound(m["a","b",Z(7)]);
+Unbind(m[1][2,3])
+
+
+! Test Code
+
+! Prefetch
+
+!! Changeset
+
+!! End

lib/list.gd

@@ -164,7 +164,7 @@ DeclareAttributeKernel( "Length", IsList, LENGTH );
 ##  <#/GAPDoc>
 ##
 DeclareOperationKernel( "IsBound[]",
-    [ IsList, IS_INT ],
+    [ IsList, IsObject ],
     ISB_LIST );
 
 
@@ -173,7 +173,7 @@ DeclareOperationKernel( "IsBound[]",
 #o  <list>[<pos>] . . . . . . . . . . . . . . . select an element from a list
 ##
 DeclareOperationKernel( "[]",
-    [ IsList, IS_INT ],
+    [ IsList, IsObject ],
     ELM_LIST );
 
 
@@ -234,7 +234,7 @@ DeclareOperationKernel( "Elm0List",
 ##  <#/GAPDoc>
 ##
 DeclareOperationKernel( "Unbind[]",
-    [ IsList and IsMutable, IS_INT ],
+    [ IsList and IsMutable, IsObject ],
     UNB_LIST );
 
 
@@ -243,7 +243,7 @@ DeclareOperationKernel( "Unbind[]",
 #o  <list>[<pos>] := <obj>
 ##
 DeclareOperationKernel( "[]:=",
-    [ IsList and IsMutable, IS_INT, IsObject ],
+    [ IsList and IsMutable, IsObject, IsObject ],
     ASS_LIST );
 
 

src/code.c

@@ -2353,20 +2353,24 @@ void CodeIsbGVar (
 *F  CodeAssListLevel( <level> ) . . . . . .  code assignment to several lists
 *F  CodeAsssListLevel( <level> )  . code multiple assignment to several lists
 */
-void CodeAssListUniv (
-    Stat                ass )
+void CodeAssListUniv ( 
+		      Stat                ass,
+		       Int narg)
 {
     Expr                list;           /* list expression                 */
     Expr                pos;            /* position expression             */
     Expr                rhsx;           /* right hand side expression      */
+    Int i;
 
     /* enter the right hand side expression                                */
     rhsx = PopExpr();
-    ADDR_STAT(ass)[2] = (Stat)rhsx;
+    ADDR_STAT(ass)[narg+1] = (Stat)rhsx;
 
     /* enter the position expression                                       */
-    pos = PopExpr();
-    ADDR_STAT(ass)[1] = (Stat)pos;
+    for (i = narg; i > 0; i--) {
+      pos = PopExpr();
+      ADDR_STAT(ass)[i] = (Stat)pos;
+    }
 
     /* enter the list expression                                           */
     list = PopExpr();
@@ -2376,15 +2380,25 @@ void CodeAssListUniv (
     PushStat( ass );
 }
 
-void CodeAssList ( void )
+void CodeAssList ( Int narg )
 {
     Stat                ass;            /* assignment, result              */
 
     /* allocate the assignment                                             */
-    ass = NewStat( T_ASS_LIST, 3 * sizeof(Stat) );
+    switch (narg) {
+    case 1:
+      ass = NewStat( T_ASS_LIST, 3 * sizeof(Stat) );
+      break;
+
+    case 2:
+      ass = NewStat(T_ASS2_LIST, 4* sizeof(Stat));
+      break;
+    default:
+      ass  = NewStat(T_ASSX_LIST, (narg + 2)*sizeof(Stat));
+    }
 
     /* let 'CodeAssListUniv' do the rest                                   */
-    CodeAssListUniv( ass );
+    CodeAssListUniv( ass, narg );
 }
 
 void CodeAsssList ( void )
@@ -2395,20 +2409,20 @@ void CodeAsssList ( void )
     ass = NewStat( T_ASSS_LIST, 3 * sizeof(Stat) );
 
     /* let 'CodeAssListUniv' do the rest                                   */
-    CodeAssListUniv( ass );
+    CodeAssListUniv( ass, 1 );
 }
 
-void CodeAssListLevel (
+void CodeAssListLevel ( Int narg,
     UInt                level )
 {
     Stat                ass;            /* assignment, result              */
 
     /* allocate the assignment and enter the level                         */
-    ass = NewStat( T_ASS_LIST_LEV, 4 * sizeof(Stat) );
-    ADDR_STAT(ass)[3] = (Stat)level;
+    ass = NewStat( T_ASS_LIST_LEV, (narg +3) * sizeof(Stat) );
+    ADDR_STAT(ass)[narg+2] = (Stat)level;
 
     /* let 'CodeAssListUniv' do the rest                                   */
-    CodeAssListUniv( ass );
+    CodeAssListUniv( ass, narg );
 }
 
 void CodeAsssListLevel (
@@ -2421,26 +2435,29 @@ void CodeAsssListLevel (
     ADDR_STAT(ass)[3] = (Stat)level;
 
     /* let 'CodeAssListUniv' do the rest                                   */
-    CodeAssListUniv( ass );
+    CodeAssListUniv( ass, 1 );
 }
 
 
 /****************************************************************************
 **
 *F  CodeUnbList() . . . . . . . . . . . . . . .  code unbind of list position
 */
-void CodeUnbList ( void )
+void CodeUnbList ( Int narg )
 {
     Expr                list;           /* list expression                 */
     Expr                pos;            /* position expression             */
     Stat                ass;            /* unbind, result                  */
+    Int i;
 
     /* allocate the unbind                                                 */
-    ass = NewStat( T_UNB_LIST, 2 * sizeof(Stat) );
+    ass = NewStat( T_UNB_LIST, (narg+1) * sizeof(Stat) );
 
-    /* enter the position expression                                       */
-    pos = PopExpr();
-    ADDR_STAT(ass)[1] = (Stat)pos;
+    /* enter the position expressions                                       */
+    for (i = narg; i > 0; i--) {
+      pos = PopExpr();
+      ADDR_STAT(ass)[i] = (Stat)pos;
+    }
 
     /* enter the list expression                                           */
     list = PopExpr();
@@ -2459,14 +2476,19 @@ void CodeUnbList ( void )
 *F  CodeElmsListLevel( <level> )  .  code multiple selection of several lists
 */
 void CodeElmListUniv (
-    Expr                ref )
+		      Expr                ref,
+		      Int narg)
 {
     Expr                list;           /* list expression                 */
     Expr                pos;            /* position expression             */
+    Int                i;
 
     /* enter the position expression                                       */
-    pos = PopExpr();
-    ADDR_EXPR(ref)[1] = pos;
+
+    for (i = narg; i > 0; i--) {
+      pos = PopExpr();
+      ADDR_EXPR(ref)[i] = pos;
+    }
 
     /* enter the list expression                                           */
     list = PopExpr();
@@ -2476,15 +2498,21 @@ void CodeElmListUniv (
     PushExpr( ref );
 }
 
-void CodeElmList ( void )
+void CodeElmList ( Int narg )
 {
     Expr                ref;            /* reference, result               */
 
-    /* allocate the reference                                              */
-    ref = NewExpr( T_ELM_LIST, 2 * sizeof(Expr) );
-
-    /* let 'CodeElmListUniv' to the rest                                   */
-    CodeElmListUniv( ref );
+      /* allocate the reference                                              */
+    if (narg == 1)
+      ref = NewExpr( T_ELM_LIST, 2 * sizeof(Expr) );
+    else if (narg == 2)
+      ref = NewExpr( T_ELM2_LIST, 3 * sizeof(Expr) );
+    else
+      ref = NewExpr( T_ELMX_LIST, (narg + 1) *sizeof(Expr));
+
+      /* let 'CodeElmListUniv' to the rest                                   */
+    CodeElmListUniv( ref, narg );
+
 }
 
 void CodeElmsList ( void )
@@ -2495,20 +2523,20 @@ void CodeElmsList ( void )
     ref = NewExpr( T_ELMS_LIST, 2 * sizeof(Expr) );
 
     /* let 'CodeElmListUniv' to the rest                                   */
-    CodeElmListUniv( ref );
+    CodeElmListUniv( ref, 1 );
 }
 
-void CodeElmListLevel (
+void CodeElmListLevel ( Int narg,
     UInt                level )
 {
     Expr                ref;            /* reference, result               */
 
-    /* allocate the reference and enter the level                          */
-    ref = NewExpr( T_ELM_LIST_LEV, 3 * sizeof(Expr) );
-    ADDR_EXPR(ref)[2] = (Stat)level;
+    ref = NewExpr( T_ELM_LIST_LEV, (narg+2)*sizeof(Expr));
+    ADDR_EXPR(ref)[narg+1] = (Stat)level;
+      
 
     /* let 'CodeElmListUniv' do the rest                                   */
-    CodeElmListUniv( ref );
+    CodeElmListUniv( ref, narg );
 }
 
 void CodeElmsListLevel (
@@ -2521,26 +2549,29 @@ void CodeElmsListLevel (
     ADDR_EXPR(ref)[2] = (Stat)level;
 
     /* let 'CodeElmListUniv' do the rest                                   */
-    CodeElmListUniv( ref );
+    CodeElmListUniv( ref, 1 );
 }
 
 
 /****************************************************************************
 **
 *F  CodeIsbList() . . . . . . . . . . . . . .  code bound list position check
 */
-void CodeIsbList ( void )
+void CodeIsbList ( Int narg )
 {
     Expr                ref;            /* isbound, result                 */
     Expr                list;           /* list expression                 */
     Expr                pos;            /* position expression             */
+    Int i;
 
     /* allocate the isbound                                                */
-    ref = NewExpr( T_ISB_LIST, 2 * sizeof(Expr) );
+    ref = NewExpr( T_ISB_LIST, (narg + 1) * sizeof(Expr) );
 
     /* enter the position expression                                       */
-    pos = PopExpr();
-    ADDR_EXPR(ref)[1] = pos;
+    for (i = narg; i > 0; i--) {
+      pos = PopExpr();
+      ADDR_EXPR(ref)[i] = pos;
+    }
 
     /* enter the list expression                                           */
     list = PopExpr();

src/code.h

@@ -387,7 +387,12 @@ Obj FILENAME_STAT(Stat stat);
 #define T_FLOAT_EXPR_EAGER      (FIRST_EXPR_TNUM+82)
 #define T_FLOAT_EXPR_LAZY       (FIRST_EXPR_TNUM+83)
 
-#define LAST_EXPR_TNUM          T_FLOAT_EXPR_LAZY
+#define T_ELM2_LIST             (FIRST_EXPR_TNUM+84)
+#define T_ELMX_LIST             (FIRST_EXPR_TNUM+85)
+#define T_ASS2_LIST             (FIRST_EXPR_TNUM+86)
+#define T_ASSX_LIST             (FIRST_EXPR_TNUM+87)
+
+#define LAST_EXPR_TNUM          T_ASSX_LIST
 
 
 /****************************************************************************
@@ -1153,17 +1158,17 @@ extern  void            CodeIsbGVar (
 *F  CodeAssListLevel(<level>) . . . . . . .  code assignment to several lists
 *F  CodeAsssListLevel(<level>)  . . code multiple assignment to several lists
 */
-extern  void            CodeAssList ( void );
+extern  void            CodeAssList ( Int narg );
 
 extern  void            CodeAsssList ( void );
 
-extern  void            CodeAssListLevel (
+extern  void            CodeAssListLevel ( Int narg,
             UInt                level );
 
 extern  void            CodeAsssListLevel (
             UInt                level );
 
-extern  void            CodeUnbList ( void );
+extern  void            CodeUnbList ( Int narg );
 
 
 /****************************************************************************
@@ -1173,17 +1178,18 @@ extern  void            CodeUnbList ( void );
 *F  CodeElmListLevel(<level>) . . . . . . . . code selection of several lists
 *F  CodeElmsListLevel(<level>)  . .  code multiple selection of several lists
 */
-extern  void            CodeElmList ( void );
+extern  void            CodeElmList ( Int narg );
 
 extern  void            CodeElmsList ( void );
 
 extern  void            CodeElmListLevel (
-            UInt                level );
+					  Int narg,
+					  UInt level);
 
 extern  void            CodeElmsListLevel (
             UInt                level );
 
-extern  void            CodeIsbList ( void );
+extern  void            CodeIsbList ( Int narg );
 
 
 /****************************************************************************