diff options
author | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
commit | ac586bc9b156b4ae687cd5961ba1fe7b20ec57d6 (patch) | |
tree | 052473b46d7fa18d51f897cdb9e7c93a7186dafd /jam-files/engine/frames.h | |
parent | 97b85c082b3e55c28a8b0c0eb762483ac84a1577 (diff) | |
parent | ad6d4a1b2519896f2b16a282699ce4e64041fab8 (diff) |
Merge remote branch 'upstream/master'
Conflicts:
Jamroot
bjam
decoder/Jamfile
decoder/cdec.cc
dpmert/Jamfile
jam-files/sanity.jam
klm/lm/Jamfile
klm/util/Jamfile
mira/Jamfile
Diffstat (limited to 'jam-files/engine/frames.h')
-rw-r--r-- | jam-files/engine/frames.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/jam-files/engine/frames.h b/jam-files/engine/frames.h deleted file mode 100644 index 693d77fa..00000000 --- a/jam-files/engine/frames.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2001-2004 David Abrahams. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - */ -#ifndef FRAMES_DWA20011021_H -#define FRAMES_DWA20011021_H - -#include "lists.h" -#include "modules.h" - -typedef struct _PARSE PARSE; -typedef struct frame FRAME; - -struct frame -{ - FRAME * prev; - /* The nearest enclosing frame for which module->user_module is true. */ - FRAME * prev_user; - LOL args[ 1 ]; - module_t * module; - PARSE * procedure; - char * rulename; -}; - - -/* When call into Python is in progress, this variable points to the bjam frame - * that was current at the moment of call. When the call completes, the variable - * is not defined. Further, if Jam calls Python which calls Jam and so on, this - * variable only keeps the most recent Jam frame. - */ -extern struct frame * frame_before_python_call; - -void frame_init( FRAME * ); /* implemented in compile.c */ -void frame_free( FRAME * ); /* implemented in compile.c */ - -#endif |