Warn about indexing binary types instead of failing. Allows fedex_plus to produce output for ap221 and ap235 express schemas. SCL git 4cd7e7c.

Nicholas Reed · Nicholas Reed · commit 6b15b82ff268 · 2012-06-12T18:22:26.000Z
diff --git a/include/express/express.h b/include/express/express.h
@@ -108,6 +108,7 @@ extern SCL_EXPRESS_EXPORT Error ERROR_syntax;
 extern SCL_EXPRESS_EXPORT Error ERROR_unlabelled_param_type;
 extern SCL_EXPRESS_EXPORT Error ERROR_file_unreadable;
 extern SCL_EXPRESS_EXPORT Error ERROR_file_unwriteable;
+extern SCL_EXPRESS_EXPORT Error ERROR_warn_unsupported_lang_feat;
 
 extern SCL_EXPRESS_EXPORT struct Scope_ * FUNC_NVL;
 extern SCL_EXPRESS_EXPORT struct Scope_ * FUNC_USEDIN;
diff --git a/src/express/expr.c b/src/express/expr.c
@@ -651,7 +651,6 @@ Type EXPresolve_op_logical( Expression e, Scope s ) {
     EXPresolve_op_default( e, s );
     return( Type_Logical );
 }
-
 Type EXPresolve_op_array_like( Expression e, Scope s ) {
 
     Type op1type;
@@ -664,6 +663,9 @@ Type EXPresolve_op_array_like( Expression e, Scope s ) {
         return( op1type );
     } else if( op1type == Type_Runtime ) {
         return( Type_Runtime );
+    } else if( op1type->u.type->body->type == binary_ ) {
+        ERRORreport_with_symbol( ERROR_warn_unsupported_lang_feat, &e->symbol, "indexing on a BINARY",__FILE__, __LINE__ );
+        return( Type_Binary );
     } else if( op1type->u.type->body->type == generic_ ) {
         return( Type_Generic );
     } else if( TYPEis_select( op1type ) ) {
diff --git a/src/express/express.c b/src/express/express.c
@@ -107,6 +107,7 @@ Error ERROR_syntax      = ERROR_none;
 Error ERROR_unlabelled_param_type = ERROR_none;
 Error ERROR_file_unreadable;
 Error ERROR_file_unwriteable;
+Error ERROR_warn_unsupported_lang_feat;
 
 struct Scope_ * FUNC_NVL;
 struct Scope_ * FUNC_USEDIN;
@@ -469,13 +470,14 @@ void EXPRESSinitialize( void ) {
             "Schema %s was not found in its own schema file (%s)", SEVERITY_ERROR );
     ERROR_unlabelled_param_type = ERRORcreate(
                                       "Return type or local variable requires type label in `%s'", SEVERITY_ERROR );
-    ERROR_file_unreadable = ERRORcreate(
-                                "Could not read file %s: %s", SEVERITY_ERROR );
-    ERROR_file_unwriteable = ERRORcreate(
-                                 "Could not write file %s: %s", SEVERITY_ERROR );
+    ERROR_file_unreadable = ERRORcreate( "Could not read file %s: %s", SEVERITY_ERROR );
+    ERROR_file_unwriteable = ERRORcreate( "Could not write file %s: %s", SEVERITY_ERROR );
+    ERROR_warn_unsupported_lang_feat = ERRORcreate("Unsupported language feature (%s) at %s:%d",SEVERITY_WARNING);
+
     OBJcreate( OBJ_EXPRESS, EXPRESS_get_symbol, "express file", OBJ_UNUSED_BITS );
 
     ERRORcreate_warning( "unknown_subtype", ERROR_unknown_subtype );
+    ERRORcreate_warning( "unsupported", ERROR_warn_unsupported_lang_feat );
 
     EXPRESS_PATHinit(); /* note, must follow defn of errors it needs! */
 }
