Berry minor fixes from upstream

arendst · Jul 10, 2023 · a8d8d0d · a8d8d0d
1 parent cefd42c
commit a8d8d0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/libesp32/berry/src/be_vector.h b/lib/libesp32/berry/src/be_vector.h
@@ -38,7 +38,6 @@ void be_vector_remove_end(bvector *vector);
 void be_vector_resize(bvm *vm, bvector *vector, int count);
 void be_vector_clear(bvector *vector);
 void* be_vector_release(bvm *vm, bvector *vector);
-void* be_vector_release_32(bvm *vm, bvector *vector);   /* specialized call for 32 bits aligned accesses */
 int be_nextsize(int value);
 
 #endif
diff --git a/lib/libesp32/berry/src/berry.h b/lib/libesp32/berry/src/berry.h
@@ -478,15 +478,18 @@ typedef bclass_ptr bclass_array[];
 #endif
 
 /**
- * @def PROTO_RUNTIME_BLOCK
+ * @def BE_DEBUG_SOURCE_FILE
  * @brief conditional block in bproto depending on compilation options
  *
  */
-#if BE_SOURCE_FILE
+#if BE_DEBUG_SOURCE_FILE
   #define PROTO_SOURCE_FILE(n)   \
-    ((bstring*) _source),                                       /**< source */
+    ((bstring*) n),                                         /**< source */
+  #define PROTO_SOURCE_FILE_STR(n)  \
+    be_local_const_str(n##_str_source),                     /**< source */
 #else
   #define PROTO_SOURCE_FILE(n)
+  #define PROTO_SOURCE_FILE_STR(n)
 #endif
 
 /**
@@ -496,8 +499,8 @@ typedef bclass_ptr bclass_array[];
  */
 #if BE_DEBUG_RUNTIME_INFO
   #define PROTO_RUNTIME_BLOCK   \
-    NULL,     /**< varinfo */ \
-    0,        /**< nvarinfo */
+    NULL,     /**< lineinfo */ \
+    0,        /**< nlineinfo */
 #else
   #define PROTO_RUNTIME_BLOCK
 #endif
@@ -538,7 +541,7 @@ typedef bclass_ptr bclass_array[];
     BE_IIF(_is_subproto)((struct bproto**)&_name##_subproto,NULL),    /**< bproto **ptab */        \
     (binstruction*) &_name##_code,                                    /**< code */                 \
     be_local_const_str(_name##_str_name),                             /**< name */                 \
-    be_local_const_str(_name##_str_source),                           /**< source */               \
+    PROTO_SOURCE_FILE_STR(_name)                                      /**< source */               \
     PROTO_RUNTIME_BLOCK                                               /**< */                      \
     PROTO_VAR_INFO_BLOCK                                              /**< */                      \
   }