Skip to content

Commit

Permalink
Merge pull request #164 from wrapl/dev
Browse files Browse the repository at this point in the history
dev
  • Loading branch information
rajamukherji authored Oct 5, 2021
2 parents 84a7777 + 5099e64 commit b9deb82
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
6 changes: 4 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rabs (2.20.1) UNRELEASED; urgency=medium
rabs (2.20.2) UNRELEASED; urgency=medium

* Updates.
* Updates.
Expand All @@ -24,5 +24,7 @@ rabs (2.20.1) UNRELEASED; urgency=medium
* Updates.
* Updates.
* Updates.
* Updates.
* Updates.

-- Raja Mukherji <raja@localhost.localdomain> Sat, 02 Oct 2021 10:06:03 +0100
-- Raja Mukherji <raja@localhost.localdomain> Tue, 05 Oct 2021 09:11:59 +0100
2 changes: 1 addition & 1 deletion src/rabs.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extern __thread target_t *CurrentTarget;

ml_value_t *rabs_global(const char *Name);

#define CURRENT_VERSION 2, 20, 1
#define CURRENT_VERSION 2, 20, 2
#define WORKING_VERSION 2, 10, 0

#endif
11 changes: 4 additions & 7 deletions src/targetset.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ typedef struct {
int Index;
} targetset_iter_t;

static void targetset_iter_key(ml_state_t *Caller, targetset_iter_t *Iter) {
static void ML_TYPED_FN(ml_iter_key, TargetSetIterT, ml_state_t *Caller, targetset_iter_t *Iter) {
ML_CONTINUE(Caller, ml_integer(Iter->Index));
}

static void targetset_iter_value(ml_state_t *Caller, targetset_iter_t *Iter) {
static void ML_TYPED_FN(ml_iter_value, TargetSetIterT, ml_state_t *Caller, targetset_iter_t *Iter) {
ML_CONTINUE(Caller, Iter->Current[0]);
}

static void targetset_iter_next(ml_state_t *Caller, targetset_iter_t *Iter) {
static void ML_TYPED_FN(ml_iter_next, TargetSetIterT, ml_state_t *Caller, targetset_iter_t *Iter) {
for (target_t **Current = Iter->Current + 1; Current < Iter->End; ++Current) {
if (*Current) {
Iter->Current = Current;
Expand All @@ -32,7 +32,7 @@ static void targetset_iter_next(ml_state_t *Caller, targetset_iter_t *Iter) {

ML_TYPE(TargetSetIterT, (), "targetset-iter");

static void targetset_iterate(ml_state_t *Caller, targetset_t *Set) {
static void ML_TYPED_FN(ml_iterate, TargetSetT, ml_state_t *Caller, targetset_t *Set) {
target_t **End = Set->Targets + Set->Size;
for (target_t **T = Set->Targets; T < End; ++T) {
if (*T) {
Expand All @@ -51,9 +51,6 @@ ML_TYPE(TargetSetT, (MLSequenceT), "targetset");

void targetset_ml_init() {
#include "targetset_init.c"
ml_typed_fn_set(TargetSetT, ml_iterate, targetset_iterate);
ml_typed_fn_set(TargetSetIterT, ml_iter_next, targetset_iter_next);
ml_typed_fn_set(TargetSetIterT, ml_iter_value, targetset_iter_value);
}

targetset_t *targetset_new() {
Expand Down

0 comments on commit b9deb82

Please sign in to comment.