haikuprojects/befpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a lot of warnings and errors.

Browse Source
This commit is contained in:
jetsoni
2003-10-20 22:46:40 +00:00
parent c8a98c8264
commit c6677f2205
53 changed files with 191 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bepascal/Jamrules
View File

@@ -37,7 +37,7 @@ rule fpcMkObjectDirs
{ {
dir = [ FDirName $(LOCATE_TARGET) $(i:D) ] ; dir = [ FDirName $(LOCATE_TARGET) $(i:D) ] ;
Depends $(i:S=$(SUFOBJ)) : $(dir) ; Depends $(i:S=$(SUFOBJ)) : $(dir) ;
MkDir $(dir) ; MkDir -p $(dir) ;
} }
} }
@@ -59,6 +59,13 @@ actions fpc
fpc -g -S2 $(2) -FE$(dir) ; fpc -g -S2 $(2) -FE$(dir) ;
} }
# call the Lex interpreter
actions Lex
{
flex $(2) ;
}
# Make a zip file named $(1) that include (recursively) all files in the directory list $(2), except the ones # Make a zip file named $(1) that include (recursively) all files in the directory list $(2), except the ones
# in the CVS subdirectories # in the CVS subdirectories
rule MakeZip rule MakeZip
@@ -145,7 +152,7 @@ rule MkObjectDirs
{ {
dir = [ FDirName $(LOCATE_TARGET) $(i:D) ] ; dir = [ FDirName $(LOCATE_TARGET) $(i:D) ] ;
Depends $(i:S=$(SUFOBJ)) : $(dir) ; Depends $(i:S=$(SUFOBJ)) : $(dir) ;
MkDir $(dir) ; MkDir -p $(dir) ;
} }
} }

4
bepascal/source/bepascal/cpp/include/be/app/application.h
View File

@@ -37,7 +37,7 @@
#include <message.h> #include <message.h>
#include <beobj.h> #include <beobj.h>
class BPApplication : public BApplication, public virtual BPLooper class BPApplication : public BApplication, public BPLooper
{ {
public: public:
BPApplication(TPasObject PasObject, const char *signature); BPApplication(TPasObject PasObject, const char *signature);
@@ -53,4 +53,4 @@ class BPApplication : public BApplication, public virtual BPLooper
private: private:
}; };
#endif /* _APPLICATION_H_ */ #endif /* _APPLICATION_H_ */

4
bepascal/source/bepascal/cpp/include/be/app/handler.h
View File

@@ -27,7 +27,7 @@
typedef void (*BHandler_MessageReceived_hook) (TPasObject PasObject, TCPlusObject message); typedef void (*BHandler_MessageReceived_hook) (TPasObject PasObject, TCPlusObject message);
class BPHandler : public BHandler, public virtual BPasObject class BPHandler : public BHandler, public BPasObject
{ {
public: public:
BPHandler(TPasObject PasObject, const char *name = NULL); BPHandler(TPasObject PasObject, const char *name = NULL);
@@ -38,4 +38,4 @@ class BPHandler : public BHandler, public virtual BPasObject
private: private:
}; };
#endif /* _HANDLER_H_ */ #endif /* _HANDLER_H_ */

4
bepascal/source/bepascal/cpp/include/be/app/looper.h
View File

@@ -28,7 +28,7 @@
#include <handler.h> #include <handler.h>
class BPLooper : public BLooper, public virtual BPHandler class BPLooper : public BLooper, public BPHandler
{ {
public: public:
BPLooper(TPasObject PasObject, const char *name = NULL, BPLooper(TPasObject PasObject, const char *name = NULL,
@@ -43,4 +43,4 @@ class BPLooper : public BLooper, public virtual BPHandler
private: private:
}; };
#endif /* _LOOPER_H_ */ #endif /* _LOOPER_H_ */

2
bepascal/source/bepascal/cpp/include/be/app/message.h
View File

@@ -35,4 +35,4 @@ class BPMessage : public BMessage, private BPasObject
private: private:
}; };
#endif /* _MESSAGE_H_ */ #endif /* _MESSAGE_H_ */

2
bepascal/source/bepascal/cpp/include/be/app/roster.h
View File

@@ -21,4 +21,4 @@
#include <Roster.h> #include <Roster.h>
#endif /* _ROSTER_H_ */ #endif /* _ROSTER_H_ */

2
bepascal/source/bepascal/cpp/include/be/bepas_kernel/beobj.h
View File

@@ -35,4 +35,4 @@ class BPasObject
TPasObject FPasObject; TPasObject FPasObject;
}; };
#endif /* _BEOBJ_H_ */ #endif /* _BEOBJ_H_ */

4
bepascal/source/bepascal/cpp/include/be/interface/control.h
View File

@@ -26,7 +26,7 @@
typedef void (*BControl_SetEnabled_hook) (TPasObject PasObject, bool enabled); typedef void (*BControl_SetEnabled_hook) (TPasObject PasObject, bool enabled);
typedef void (*BControl_SetValue_hook) (TPasObject PasObject, int32 value); typedef void (*BControl_SetValue_hook) (TPasObject PasObject, int32 value);
class BPControl : public BControl, virtual public BPView class BPControl : public BControl, public BPView
{ {
public: public:
// <BView_Constructor> // <BView_Constructor>
@@ -48,4 +48,4 @@ class BPControl : public BControl, virtual public BPView
private: private:
}; };
#endif /* _CONTROL_H_ */ #endif /* _CONTROL_H_ */

4
bepascal/source/bepascal/cpp/include/be/interface/listview.h
View File

@@ -28,7 +28,7 @@
#include <handler.h> #include <handler.h>
#include <beobj.h> #include <beobj.h>
class BPListView : public BListView, virtual public BPView class BPListView : public BListView, public BPView
{ {
public: public:
@@ -76,4 +76,4 @@ virtual void AllDetached();
protected: protected:
}; };
#endif /* _LISTVIEW_H_ */ #endif /* _LISTVIEW_H_ */

4
bepascal/source/bepascal/cpp/include/be/interface/menu.h
View File

@@ -7,7 +7,7 @@
#include "view.h" #include "view.h"
#include <beobj.h> #include <beobj.h>
class BPMenu : public BMenu, virtual public BPView class BPMenu : public BMenu, public BPView
{ {
public: public:
BPMenu(TPasObject PasObject, const char *name, menu_layout layout = B_ITEMS_IN_COLUMN); BPMenu(TPasObject PasObject, const char *name, menu_layout layout = B_ITEMS_IN_COLUMN);
@@ -40,4 +40,4 @@ class BPMenu : public BMenu, virtual public BPView
private: private:
}; };
#endif /* _MENU_H_ */ #endif /* _MENU_H_ */

2
bepascal/source/bepascal/cpp/include/be/interface/menubar.h
View File

@@ -5,7 +5,7 @@
#include "menu.h" #include "menu.h"
#include <beobj.h> #include <beobj.h>
class BPMenuBar : public BMenuBar, virtual public BPMenu class BPMenuBar : public BMenuBar, public BPMenu
{ {
public: public:
BPMenuBar(TPasObject PasObject, BRect frame, const char *name, BPMenuBar(TPasObject PasObject, BRect frame, const char *name,

2
bepascal/source/bepascal/cpp/include/be/interface/menuitem.h
View File

@@ -48,4 +48,4 @@ class BPSeparatorItem : public BSeparatorItem, virtual public BPMenuItem
virtual void DrawContent(void); virtual void DrawContent(void);
}; };
#endif /* _MENUITEM_H_ */ #endif /* _MENUITEM_H_ */

2
bepascal/source/bepascal/cpp/include/be/interface/point.h
View File

@@ -31,4 +31,4 @@ class BPPoint : public BPoint, public BPasObject
BPPoint(TPasObject PasObject); BPPoint(TPasObject PasObject);
}; };
#endif _POINT_H_ /* _POINT_H_ */ #endif _POINT_H_ /* _POINT_H_ */

2
bepascal/source/bepascal/cpp/include/be/interface/rect.h
View File

@@ -34,4 +34,4 @@ class BPRect : public BRect, public BPasObject
BPRect(TPasObject PasObject, BPoint leftTop, BPoint rightBottom); BPRect(TPasObject PasObject, BPoint leftTop, BPoint rightBottom);
}; };
#endif _RECT_H_ /* _RECT_H_ */ #endif _RECT_H_ /* _RECT_H_ */

2
bepascal/source/bepascal/cpp/include/be/interface/view.h
View File

@@ -75,4 +75,4 @@ class BPView : public BView, public virtual BPHandler
private: private:
}; };
#endif /* _VIEW_H_ */ #endif /* _VIEW_H_ */

2
bepascal/source/bepascal/cpp/include/be/interface/window.h
View File

@@ -43,4 +43,4 @@ class BPWindow : public BWindow, public BPLooper
private: private:
}; };
#endif /* _WINDOW_H_ */ #endif /* _WINDOW_H_ */

2
bepascal/source/bepascal/cpp/include/be/support/archivable.h
View File

@@ -39,4 +39,4 @@ static BArchivable *Instantiate(BMessage *from);
private: private:
}; };
#endif /* _ARCHIVABLE_H_ */ #endif /* _ARCHIVABLE_H_ */

14
bepascal/source/bepascal/cpp/src/be/app/Application.cpp
View File

@@ -60,17 +60,19 @@ BMessenger *be_app_messengerCPlus;
#endif #endif
BPApplication::BPApplication(TPasObject PasObject, const char *signature) BPApplication::BPApplication(TPasObject PasObject, const char *signature)
: BApplication(signature), BPHandler(PasObject), BPLooper(PasObject), : BApplication(signature),
BPasObject(PasObject) // BPHandler(PasObject),
BPLooper(PasObject)
// BPasObject(PasObject)
{ {
be_app_messengerCPlus = &be_app_messenger; be_app_messengerCPlus = &be_app_messenger;
} }
BPApplication::BPApplication(TPasObject PasObject, const char *signature, BPApplication::BPApplication(TPasObject PasObject, const char *signature,
status_t *error) : BApplication(signature, error), status_t *error) : BApplication(signature, error),
BPHandler(PasObject), // BPHandler(PasObject),
BPLooper(PasObject), BPLooper(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
be_app_messengerCPlus = &be_app_messenger; be_app_messengerCPlus = &be_app_messenger;
} }
@@ -171,4 +173,4 @@ status_t BApplication_GetAppInfo(TCPlusObject Application,app_info *info)
} }
#endif #endif
#endif /* _APPLICATION_CPP_ */ #endif /* _APPLICATION_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/app/Clipboard.cpp
View File

@@ -270,4 +270,4 @@ BClipboard_UploadToSystem(BClipboard *Clipboard)
} }
#endif #endif
#endif /* _CLIPBOARD_CPP_ */ #endif /* _CLIPBOARD_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/app/Handler.cpp
View File

@@ -75,4 +75,4 @@ TCPlusObject BHandler_Create(TPasObject PasObject, const char *name)
} }
#endif #endif
#endif /* _HANDLER_CPP_ */ #endif /* _HANDLER_CPP_ */

6
bepascal/source/bepascal/cpp/src/be/app/Looper.cpp
View File

@@ -51,8 +51,8 @@ BPLooper::BPLooper(TPasObject PasObject, const char *name = NULL,
int32 priority = B_NORMAL_PRIORITY, int32 priority = B_NORMAL_PRIORITY,
int32 portCapacity = B_LOOPER_PORT_DEFAULT_CAPACITY) int32 portCapacity = B_LOOPER_PORT_DEFAULT_CAPACITY)
: BLooper(name, priority, portCapacity), : BLooper(name, priority, portCapacity),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -128,4 +128,4 @@ status_t BLooper_PostMessage_2(TCPlusObject Looper, uint32 command)
} }
#endif #endif
#endif /* _LOOPER_CPP_ */ #endif /* _LOOPER_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/app/Message.cpp
View File

@@ -244,4 +244,4 @@ BMessage_operator_equal(BMessage *Message, const BMessage &msg)
#endif #endif
#endif /* _MESSAGE_CPP_ */ #endif /* _MESSAGE_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/app/Messenger.cpp
View File

@@ -275,4 +275,4 @@ BMessenger_Team(BMessenger *Messenger)
} }
#endif #endif
#endif /* _MESSENGER_CPP_ */ #endif /* _MESSENGER_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/app/Roster.cpp
View File

@@ -741,4 +741,4 @@ BRoster_InitMessengers(BRoster *Roster)
} }
#endif #endif
#endif /* _ROSTER_CPP_ */ #endif /* _ROSTER_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/bepas_kernel/beobj.cpp
View File

@@ -48,4 +48,4 @@ char *BPasObject::GetPasClassName(void)
return PasObject_GetPasClassName_hook(FPasObject); return PasObject_GetPasClassName_hook(FPasObject);
} }
#endif /* _BEOBJ_CPP_ */ #endif /* _BEOBJ_CPP_ */

20
bepascal/source/bepascal/cpp/src/be/interface/Alert.cpp
View File

@@ -28,7 +28,7 @@
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/*----- BAlert class ---------------------------------------------*/ /*----- BAlert class ---------------------------------------------*/
class BPAlert : public BAlert, public virtual BPWindow // Is this OK? or should be public virtual? class BPAlert : public BAlert, public BPWindow // Is this OK? or should be public virtual?
{ {
public: public:
BPAlert(TPasObject PasObject, BPAlert(TPasObject PasObject,
@@ -124,16 +124,16 @@ BPAlert::BPAlert(TPasObject PasObject,
button_width width = B_WIDTH_AS_USUAL, button_width width = B_WIDTH_AS_USUAL,
alert_type type = B_INFO_ALERT) alert_type type = B_INFO_ALERT)
: BAlert(title, text, button1, button2, button3, width, type), : BAlert(title, text, button1, button2, button3, width, type),
BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0), BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0)
// oco or Baldur : // oco or Baldur :
// why this doesn't work? compiler says: // why this doesn't work? compiler says:
// BPWindow doesn't have a BPLooper member. The same with BPArchivable. // BPWindow doesn't have a BPLooper member. The same with BPArchivable.
// BPLooper(PasObject), // BPLooper(PasObject),
BPHandler(PasObject, title), // BPHandler(PasObject, title),
// BPArchivable(PasObject), // BPArchivable(PasObject),
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -148,11 +148,11 @@ BPAlert::BPAlert(TPasObject PasObject,
button_spacing spacing, button_spacing spacing,
alert_type type = B_INFO_ALERT) alert_type type = B_INFO_ALERT)
: BAlert(title, text, button1, button2, button3, width, spacing, type), : BAlert(title, text, button1, button2, button3, width, spacing, type),
BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0), BPWindow(PasObject, BRect(), title, B_UNTYPED_WINDOW, 0, 0)
// BPLooper(PasObject), // BPLooper(PasObject),
BPHandler(PasObject, title), // BPHandler(PasObject, title),
// BPArchivable(PasObject), // BPArchivable(PasObject),
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -160,11 +160,11 @@ BPAlert::BPAlert(TPasObject PasObject,
BPAlert::BPAlert(TPasObject PasObject, BMessage *data) BPAlert::BPAlert(TPasObject PasObject, BMessage *data)
: BAlert(data), : BAlert(data),
// UGLY HACK!!! FIX ME!!! (should be "BPWindow(PasObject, data)" ) // UGLY HACK!!! FIX ME!!! (should be "BPWindow(PasObject, data)" )
BPWindow(PasObject, BRect(), "Ugly_Hack!", B_UNTYPED_WINDOW, 0, 0), BPWindow(PasObject, BRect(), "Ugly_Hack!", B_UNTYPED_WINDOW, 0, 0)
// BPLooper(PasObject), // BPLooper(PasObject),
BPHandler(PasObject), // BPHandler(PasObject),
// BPArchivable(PasObject), // BPArchivable(PasObject),
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

10
bepascal/source/bepascal/cpp/src/be/interface/Box.cpp
View File

@@ -27,7 +27,7 @@
#include <beobj.h> #include <beobj.h>
class BPBox : public BBox, virtual public BPView class BPBox : public BBox, public BPView
{ {
public: public:
BPBox(TPasObject PasObject, BPBox(TPasObject PasObject,
@@ -112,8 +112,8 @@ BPBox::BPBox(TPasObject PasObject,
: :
BBox(bounds, name, resizeFlags, flags, border), BBox(bounds, name, resizeFlags, flags, border),
BPView(PasObject, bounds, name, resizeFlags, flags), BPView(PasObject, bounds, name, resizeFlags, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -122,8 +122,8 @@ BPBox::BPBox(TPasObject PasObject, BMessage *archive)
: :
BBox(archive), BBox(archive),
BPView(PasObject, archive), BPView(PasObject, archive),
BPHandler(PasObject, archive), BPHandler(PasObject, archive)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

16
bepascal/source/bepascal/cpp/src/be/interface/Button.cpp
View File

@@ -42,7 +42,7 @@ BButton_MakeDefault_hook Button_MakeDefault_hook;
} }
#endif #endif
class BPButton : public BButton, virtual public BPControl class BPButton : public BButton, public BPControl
{ {
public: public:
// <BView_Constructor> // <BView_Constructor>
@@ -91,9 +91,9 @@ BPButton::BPButton(TPasObject PasObject, BRect frame,
resizeMask, flags), resizeMask, flags),
BPControl(PasObject, frame, name, label, message, BPControl(PasObject, frame, name, label, message,
resizeMask, flags), resizeMask, flags),
BPView(PasObject, frame, name, resizeMask, flags), // BPView(PasObject, frame, name, resizeMask, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -101,9 +101,9 @@ BPButton::BPButton(TPasObject PasObject, BRect frame,
BPButton::BPButton(TPasObject PasObject, BMessage *archive) BPButton::BPButton(TPasObject PasObject, BMessage *archive)
:BButton(archive), :BButton(archive),
BPControl(PasObject, archive), BPControl(PasObject, archive),
BPView(PasObject, archive), // BPView(PasObject, archive),
BPHandler(PasObject, archive), BPHandler(PasObject, archive)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -683,4 +683,4 @@ BButton_Execute(BButton *Button)
} }
#endif #endif
#endif /* _BUTTON_CPP_ */ #endif /* _BUTTON_CPP_ */

14
bepascal/source/bepascal/cpp/src/be/interface/CheckBox.cpp
View File

@@ -41,7 +41,7 @@ extern "C" {
} }
#endif #endif
class BPCheckBox : public BCheckBox, virtual public BPControl { class BPCheckBox : public BCheckBox, public BPControl {
public: public:
BPCheckBox(TPasObject PasObject, BRect frame, BPCheckBox(TPasObject PasObject, BRect frame,
@@ -105,9 +105,9 @@ BPCheckBox::BPCheckBox(TPasObject PasObject,
message,rmask,flags), message,rmask,flags),
BPControl(PasObject, frame, name, label, message, BPControl(PasObject, frame, name, label, message,
rmask, flags), rmask, flags),
BPView(PasObject, frame, name, rmask, flags), // BPView(PasObject, frame, name, rmask, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -115,9 +115,9 @@ BPCheckBox::BPCheckBox(TPasObject PasObject,
BPCheckBox::BPCheckBox(TPasObject PasObject, BMessage *archive) BPCheckBox::BPCheckBox(TPasObject PasObject, BMessage *archive)
:BCheckBox(archive), :BCheckBox(archive),
BPControl(PasObject, archive), BPControl(PasObject, archive),
BPView(PasObject, archive), // BPView(PasObject, archive),
BPHandler(PasObject, archive), BPHandler(PasObject, archive)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

10
bepascal/source/bepascal/cpp/src/be/interface/Control.cpp
View File

@@ -51,8 +51,8 @@ BPControl::BPControl(TPasObject PasObject, BRect frame,
BControl(frame, name, label, message, BControl(frame, name, label, message,
resizeMask, flags), resizeMask, flags),
BPView(PasObject, frame, name, resizeMask, flags), BPView(PasObject, frame, name, resizeMask, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -60,8 +60,8 @@ BPControl::BPControl(TPasObject PasObject, BRect frame,
BPControl::BPControl(TPasObject PasObject, BMessage *message): BPControl::BPControl(TPasObject PasObject, BMessage *message):
BControl(message), BControl(message),
BPView(PasObject, message), BPView(PasObject, message),
BPHandler(PasObject, message), BPHandler(PasObject, message)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -557,4 +557,4 @@ BControl_InitData(BControl *Control, BMessage *data)
} }
#endif #endif
#endif /* _CONTROL_CPP_ */ #endif /* _CONTROL_CPP_ */

8
bepascal/source/bepascal/cpp/src/be/interface/ListView.cpp
View File

@@ -44,8 +44,8 @@ BListString_InitiateDrag_hook ListString_InitiateDrag_hook;
BPListView::BPListView(TPasObject PasObject,BMessage *data) BPListView::BPListView(TPasObject PasObject,BMessage *data)
:BListView(data), :BListView(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -58,8 +58,8 @@ BPListView::BPListView(TPasObject PasObject,BRect frame,
B_NAVIGABLE) B_NAVIGABLE)
:BListView(frame,name,type,resizeMask,flags), :BListView(frame,name,type,resizeMask,flags),
BPView(PasObject, BRect(0,0,0,0), name, 0, flags), BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

18
bepascal/source/bepascal/cpp/src/be/interface/Menu.cpp
View File

@@ -20,32 +20,32 @@
BPMenu::BPMenu(TPasObject PasObject, const char *name, menu_layout layout = B_ITEMS_IN_COLUMN) BPMenu::BPMenu(TPasObject PasObject, const char *name, menu_layout layout = B_ITEMS_IN_COLUMN)
:BMenu(name, layout), :BMenu(name, layout),
BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0), BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
BPMenu::BPMenu(TPasObject PasObject, const char *name, float width, float height) BPMenu::BPMenu(TPasObject PasObject, const char *name, float width, float height)
:BMenu(name, width, height), :BMenu(name, width, height),
BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0), BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
BPMenu::BPMenu(TPasObject PasObject, BMessage *archive) BPMenu::BPMenu(TPasObject PasObject, BMessage *archive)
:BMenu(archive), :BMenu(archive),
BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0), BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
BPMenu::BPMenu(TPasObject PasObject, BRect frame, const char *name, uint32 resizingMode, uint32 flags, menu_layout layout, bool resizeToFit) BPMenu::BPMenu(TPasObject PasObject, BRect frame, const char *name, uint32 resizingMode, uint32 flags, menu_layout layout, bool resizeToFit)
:BMenu(frame, name, resizingMode, flags, layout, resizeToFit), :BMenu(frame, name, resizingMode, flags, layout, resizeToFit),
BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0), BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -922,4 +922,4 @@ TCPlusObject BMenu_Create_3(TPasObject PasObject, BRect frame, const char *viewN
} }
#endif #endif
#endif /* _MENU_CPP_ */ #endif /* _MENU_CPP_ */

12
bepascal/source/bepascal/cpp/src/be/interface/MenuBar.cpp
View File

@@ -10,18 +10,18 @@ BPMenuBar::BPMenuBar(TPasObject PasObject, BRect frame, const char *name,
menu_layout layout = B_ITEMS_IN_COLUMN, bool resizeToFit = true) menu_layout layout = B_ITEMS_IN_COLUMN, bool resizeToFit = true)
:BMenuBar(frame, name, resizingMode, layout, resizeToFit), :BMenuBar(frame, name, resizingMode, layout, resizeToFit),
BPMenu(PasObject, name, layout), BPMenu(PasObject, name, layout),
BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0), // BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
BPMenuBar::BPMenuBar(TPasObject PasObject, BMessage *archive) BPMenuBar::BPMenuBar(TPasObject PasObject, BMessage *archive)
:BMenuBar(archive), :BMenuBar(archive),
BPMenu(PasObject, archive), BPMenu(PasObject, archive),
BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0), // BPView(PasObject, BRect(0, 0, 0, 0), "", 0, 0),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

2
bepascal/source/bepascal/cpp/src/be/interface/MenuItem.cpp
View File

@@ -430,4 +430,4 @@ BSeparatorItem_SetEnabled(BSeparatorItem *SeparatorItem, bool state)
} }
#endif #endif
#endif /* _MENUITEM_CPP_ */ #endif /* _MENUITEM_CPP_ */

14
bepascal/source/bepascal/cpp/src/be/interface/OutlineListView.cpp
View File

@@ -36,7 +36,7 @@ extern "C" {
} }
#endif #endif
class BPOutlineListView : public BOutlineListView, virtual public BPListView class BPOutlineListView : public BOutlineListView, public BPListView
{ {
public: public:
BPOutlineListView(TPasObject PasObject,BRect frame, BPOutlineListView(TPasObject PasObject,BRect frame,
@@ -74,9 +74,9 @@ virtual void MessageReceived(BMessage *);
BPOutlineListView::BPOutlineListView(TPasObject PasObject,BMessage *data) BPOutlineListView::BPOutlineListView(TPasObject PasObject,BMessage *data)
:BOutlineListView(data), :BOutlineListView(data),
BPListView(PasObject, data), BPListView(PasObject, data),
BPView(PasObject, data), // BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -88,9 +88,9 @@ BPOutlineListView::BPOutlineListView(TPasObject PasObject,BRect frame,
| B_NAVIGABLE) | B_NAVIGABLE)
:BOutlineListView(frame,name,type,resizeMask,flags), :BOutlineListView(frame,name,type,resizeMask,flags),
BPListView(PasObject, frame,name,type,resizeMask,flags), BPListView(PasObject, frame,name,type,resizeMask,flags),
BPView(PasObject, frame,name,resizeMask,flags), // BPView(PasObject, frame,name,resizeMask,flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

2
bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
View File

@@ -81,4 +81,4 @@ void BPoint_Set(TCPlusObject Point, float x, float y)
#endif #endif
#endif _POINT_CPP_ /* _POINT_CPP_ */ #endif _POINT_CPP_ /* _POINT_CPP_ */

14
bepascal/source/bepascal/cpp/src/be/interface/RadioButton.cpp
View File

@@ -42,7 +42,7 @@ extern "C" {
} }
#endif #endif
class BPRadioButton : public BRadioButton, virtual public BPControl { class BPRadioButton : public BRadioButton, public BPControl {
public: public:
BPRadioButton(TPasObject PasObject, BPRadioButton(TPasObject PasObject,
@@ -116,9 +116,9 @@ BPRadioButton::BPRadioButton(TPasObject PasObject,
message,rmask,flags), message,rmask,flags),
BPControl(PasObject, frame, name, label, message, BPControl(PasObject, frame, name, label, message,
rmask, flags), rmask, flags),
BPView(PasObject, frame, name, rmask, flags), // BPView(PasObject, frame, name, rmask, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -127,9 +127,9 @@ BPRadioButton::BPRadioButton(TPasObject PasObject,
BPRadioButton::BPRadioButton(TPasObject PasObject, BMessage *archive) BPRadioButton::BPRadioButton(TPasObject PasObject, BMessage *archive)
:BRadioButton(archive), :BRadioButton(archive),
BPControl(PasObject, archive), BPControl(PasObject, archive),
BPView(PasObject, archive), // BPView(PasObject, archive),
BPHandler(PasObject, archive), BPHandler(PasObject, archive)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

2
bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
View File

@@ -81,4 +81,4 @@ void BRect_PrintToStream(TCPlusObject rect)
#endif #endif
#endif _RECT_CPP_ /* _RECT_CPP_ */ #endif _RECT_CPP_ /* _RECT_CPP_ */

10
bepascal/source/bepascal/cpp/src/be/interface/ScrollBar.cpp
View File

@@ -38,7 +38,7 @@ extern "C" {
} }
#endif #endif
class BPScrollBar : public BScrollBar,virtual public BPView { class BPScrollBar : public BScrollBar, public BPView {
public: public:
BPScrollBar(TPasObject PasObject, BPScrollBar(TPasObject PasObject,
@@ -85,8 +85,8 @@ BPScrollBar::BPScrollBar(TPasObject PasObject,
max, max,
direction), direction),
BPView(PasObject, BRect(0,0,0,0), name, 0, 0), BPView(PasObject, BRect(0,0,0,0), name, 0, 0),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -94,8 +94,8 @@ BPScrollBar::BPScrollBar(TPasObject PasObject,
BPScrollBar::BPScrollBar(TPasObject PasObject, BMessage *data) BPScrollBar::BPScrollBar(TPasObject PasObject, BMessage *data)
:BScrollBar(data), :BScrollBar(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

10
bepascal/source/bepascal/cpp/src/be/interface/ScrollView.cpp
View File

@@ -38,7 +38,7 @@ extern "C" {
} }
#endif #endif
class BPScrollView : public BScrollView, virtual public BPView { class BPScrollView : public BScrollView, public BPView {
public: public:
BPScrollView( BPScrollView(
@@ -99,8 +99,8 @@ BPScrollView::BPScrollView(TPasObject PasObject,
vertical, vertical,
border), border),
BPView(PasObject, BRect(0,0,0,0), name, 0, flags), BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -110,8 +110,8 @@ BPScrollView::BPScrollView(TPasObject PasObject,
BPScrollView::BPScrollView(TPasObject PasObject, BMessage *data) BPScrollView::BPScrollView(TPasObject PasObject, BMessage *data)
:BScrollView(data), :BScrollView(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

10
bepascal/source/bepascal/cpp/src/be/interface/StatusBar.cpp
View File

@@ -38,7 +38,7 @@ extern "C" {
} }
#endif #endif
class BPStatusBar : public BStatusBar, virtual BPView class BPStatusBar : public BStatusBar, public BPView
{ {
public: public:
@@ -80,16 +80,16 @@ BPStatusBar::BPStatusBar(TPasObject PasObject,
label , label ,
trailing_label ), trailing_label ),
BPView(PasObject, BRect(0,0,0,0), name, 0, 0), BPView(PasObject, BRect(0,0,0,0), name, 0, 0),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
BPStatusBar::BPStatusBar(TPasObject PasObject,BMessage *data) BPStatusBar::BPStatusBar(TPasObject PasObject,BMessage *data)
:BStatusBar(data), :BStatusBar(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

10
bepascal/source/bepascal/cpp/src/be/interface/StringView.cpp
View File

@@ -37,7 +37,7 @@ extern "C" {
} }
#endif #endif
class BPStringView : public BStringView, virtual public BPView class BPStringView : public BStringView, public BPView
{ {
public: public:
@@ -75,8 +75,8 @@ BPStringView::BPStringView(TPasObject PasObject,
resizeFlags, resizeFlags,
flags), flags),
BPView(PasObject, BRect(0,0,0,0), name, 0, flags), BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -84,8 +84,8 @@ BPStringView::BPStringView(TPasObject PasObject,
BPStringView::BPStringView(TPasObject PasObject, BMessage *data) BPStringView::BPStringView(TPasObject PasObject, BMessage *data)
:BStringView(data), :BStringView(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

16
bepascal/source/bepascal/cpp/src/be/interface/TabView.cpp
View File

@@ -67,7 +67,7 @@ BTabView_TabFrame_hook TabView_TabFrame_hook;
} }
#endif #endif
class BPTab :public BTab , virtual public BPasObject { class BPTab :public BTab, public BPasObject {
public: public:
BPTab(TPasObject PasObject,BView* contents=NULL); BPTab(TPasObject PasObject,BView* contents=NULL);
BPTab(TPasObject PasObject,BMessage* data); BPTab(TPasObject PasObject,BMessage* data);
@@ -76,14 +76,14 @@ virtual void DrawTab(BView* owner, BRect tabFrame, tab_position,bool full=tru
}; };
BPTab::BPTab(TPasObject PasObject,BView* contents=NULL) BPTab::BPTab(TPasObject PasObject,BView* contents=NULL)
:BTab(contents), : BTab(contents),
BPasObject(PasObject) BPasObject(PasObject)
{ {
} }
BPTab::BPTab(TPasObject PasObject,BMessage* data) BPTab::BPTab(TPasObject PasObject,BMessage* data)
:BTab(data), : BTab(data),
BPasObject(PasObject) BPasObject(PasObject)
{ {
} }
@@ -100,7 +100,7 @@ void BPTab::DrawTab(BView* owner, BRect tabFrame, tab_position value, bool full)
class BPTabView : public BTabView, virtual public BPView { class BPTabView : public BTabView, public BPView {
public: public:
BPTabView(TPasObject PasObject,BRect frame, const char *name, BPTabView(TPasObject PasObject,BRect frame, const char *name,
button_width width=B_WIDTH_AS_USUAL, button_width width=B_WIDTH_AS_USUAL,
@@ -159,8 +159,8 @@ BPTabView::BPTabView(TPasObject PasObject,BRect frame, const char *name,
resizingMode, resizingMode,
flags), flags),
BPView(PasObject, frame, name, resizingMode, flags), BPView(PasObject, frame, name, resizingMode, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -168,8 +168,8 @@ BPTabView::BPTabView(TPasObject PasObject,BRect frame, const char *name,
BPTabView::BPTabView(TPasObject PasObject, BMessage *data) BPTabView::BPTabView(TPasObject PasObject, BMessage *data)
:BTabView(data), :BTabView(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
/* /*

14
bepascal/source/bepascal/cpp/src/be/interface/TextControl.cpp
View File

@@ -41,7 +41,7 @@ extern "C" {
} }
#endif #endif
class BPTextControl : public BTextControl, virtual public BPControl { class BPTextControl : public BTextControl, public BPControl {
public: public:
BPTextControl(TPasObject PasObject, BPTextControl(TPasObject PasObject,
@@ -125,9 +125,9 @@ BPTextControl::BPTextControl(TPasObject PasObject,
message,rmask,flags), message,rmask,flags),
BPControl(PasObject, frame, name, label, message, BPControl(PasObject, frame, name, label, message,
rmask, flags), rmask, flags),
BPView(PasObject, frame, name, rmask, flags), // BPView(PasObject, frame, name, rmask, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -135,9 +135,9 @@ BPTextControl::BPTextControl(TPasObject PasObject,
BPTextControl::BPTextControl(TPasObject PasObject, BMessage *archive) BPTextControl::BPTextControl(TPasObject PasObject, BMessage *archive)
:BTextControl(archive), :BTextControl(archive),
BPControl(PasObject, archive), BPControl(PasObject, archive),
BPView(PasObject, archive), // BPView(PasObject, archive),
BPHandler(PasObject, archive), BPHandler(PasObject, archive)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

14
bepascal/source/bepascal/cpp/src/be/interface/TextView.cpp
View File

@@ -40,7 +40,7 @@ extern "C" {
} }
#endif #endif
class BPTextView : public BTextView, virtual public BPView { class BPTextView : public BTextView, public BPView {
public: public:
BPTextView(TPasObject PasObject, BPTextView(TPasObject PasObject,
BRect frame, BRect frame,
@@ -232,8 +232,8 @@ BPTextView::BPTextView(TPasObject PasObject,
resizeMask, resizeMask,
flags), flags),
BPView(PasObject, BRect(0,0,0,0), name, 0, flags), BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -255,8 +255,8 @@ BPTextView::BPTextView(TPasObject PasObject,
resizeFlags, resizeFlags,
flags), flags),
BPView(PasObject, BRect(0,0,0,0), name, 0, flags), BPView(PasObject, BRect(0,0,0,0), name, 0, flags),
BPHandler(PasObject, name), BPHandler(PasObject, name)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -265,8 +265,8 @@ BPTextView::BPTextView(TPasObject PasObject,
BPTextView::BPTextView(TPasObject PasObject, BMessage *data) BPTextView::BPTextView(TPasObject PasObject, BMessage *data)
:BTextView(data), :BTextView(data),
BPView(PasObject, data), BPView(PasObject, data),
BPHandler(PasObject, data), BPHandler(PasObject, data)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

8
bepascal/source/bepascal/cpp/src/be/interface/View.cpp
View File

@@ -94,15 +94,15 @@ BPView::BPView(TPasObject PasObject,
uint32 resizingMode, uint32 resizingMode,
uint32 flags) uint32 flags)
: BView(frame, name, resizingMode, flags), : BView(frame, name, resizingMode, flags),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
BPView::BPView(TPasObject PasObject, BMessage *archive) BPView::BPView(TPasObject PasObject, BMessage *archive)
: BView(archive), : BView(archive),
BPHandler(PasObject), BPHandler(PasObject)
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }

8
bepascal/source/bepascal/cpp/src/be/interface/Window.cpp
View File

@@ -45,9 +45,9 @@ BPWindow::BPWindow(TPasObject PasObject,
uint32 flags, uint32 flags,
uint32 workspaces = B_CURRENT_WORKSPACE) uint32 workspaces = B_CURRENT_WORKSPACE)
: BWindow(frame, title, type, flags, workspaces), : BWindow(frame, title, type, flags, workspaces),
BPLooper(PasObject), BPLooper(PasObject)
BPHandler(PasObject, title), // BPHandler(PasObject, title),
BPasObject(PasObject) // BPasObject(PasObject)
{ {
} }
@@ -2100,4 +2100,4 @@ BWindow_WindowType(BWindow *Window) const
} }
#endif #endif
#endif /* _WINDOW_CPP_ */ #endif /* _WINDOW_CPP_ */

2
bepascal/source/bepascal/cpp/src/be/support/Archivable.cpp
View File

@@ -112,4 +112,4 @@ status_t BArchivable_Archive(TCPlusObject archivable, TCPlusObject into, bool de
} }
#endif #endif
#endif /* _ARCHIVABLE_CPP_ */ #endif /* _ARCHIVABLE_CPP_ */

5
bepascal/source/tools/headertoxml/source/Jamfile
View File

@@ -20,4 +20,9 @@
SubDir BEPASCAL_TOP source tools headertoxml source ; SubDir BEPASCAL_TOP source tools headertoxml source ;
actions fpc
{
fpc -g -S2 $(2) -FE$(dir) -Fusource/tools/stubgen.so/pas/ -Fllib ;
}
Objects headertoxml.pp ; Objects headertoxml.pp ;

5
bepascal/source/tools/stubgen.so/cpp/Jamfile
View File

@@ -112,8 +112,9 @@ DRIVER_PATH on $(NAME) = ;
# Specify the name of the binary # Specify the name of the binary
# If the name has spaces, you must quote it: "My App" # If the name has spaces, you must quote it: "My App"
BeMain libstubgen.so : lexer.l
parser.y BeMain libstubgen.so : parser.y
lexer.l
getopt.c getopt.c
main.c main.c
pathname.c pathname.c

8
bepascal/source/tools/stubgen.so/cpp/lexer.c
View File

@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
/* Scanner skeleton version: /* Scanner skeleton version:
* $Header: /home/haiku/befpc/bepascal/source/tools/stubgen.so/cpp/lexer.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $ * $Header: /home/haiku/befpc/bepascal/source/tools/stubgen.so/cpp/lexer.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $
*/ */
#define FLEX_SCANNER #define FLEX_SCANNER
@@ -596,7 +596,7 @@ char *yytext;
* (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z) * (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z)
* *
* DATE: Thu Aug 15 13:10:06 EDT 1996 * DATE: Thu Aug 15 13:10:06 EDT 1996
* $Id: lexer.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $ * $Id: lexer.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $
* *
* Copyright (c) 1996-1998 Michael John Radwin * Copyright (c) 1996-1998 Michael John Radwin
* *
@@ -755,7 +755,7 @@ char *yytext;
#if 0 /* #ifdef WIN32 */ #if 0 /* #ifdef WIN32 */
#include "y_tab.h" #include "y_tab.h"
#else #else
#include "y.tab.h" #include "parser.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
@@ -772,7 +772,7 @@ char *yytext;
the value as a pointer */ the value as a pointer */
#define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x) #define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x)
static const char rcsid[] = "$Id: lexer.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $"; static const char rcsid[] = "$Id: lexer.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $";
static void count(); static void count();
static void comment(); static void comment();

9
bepascal/source/tools/stubgen.so/cpp/lexer.l
View File

@@ -9,7 +9,7 @@
* (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z) * (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z)
* *
* DATE: Thu Aug 15 13:10:06 EDT 1996 * DATE: Thu Aug 15 13:10:06 EDT 1996
* $Id: lexer.l,v 1.1 2003-09-21 22:46:55 ocoursiere Exp $ * $Id: lexer.l,v 1.2 2003-10-20 22:46:40 jetsoni Exp $
* *
* Copyright (c) 1996-1998 Michael John Radwin * Copyright (c) 1996-1998 Michael John Radwin
* *
@@ -29,6 +29,9 @@
* *
* Modification history: * Modification history:
* $Log: not supported by cvs2svn $ * $Log: not supported by cvs2svn $
* Revision 1.1 2003/09/21 22:46:55 ocoursiere
* stubgen.so is now include in the build process
*
* Revision 1.1 2001/11/07 10:06:07 ithamar * Revision 1.1 2001/11/07 10:06:07 ithamar
* Added stubgen to CVS * Added stubgen to CVS
* *
@@ -174,7 +177,7 @@ IS (u|U|l|L)*
#if 0 /* #ifdef WIN32 */ #if 0 /* #ifdef WIN32 */
#include "y_tab.h" #include "y_tab.h"
#else #else
#include "y.tab.h" #include "parser.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
@@ -191,7 +194,7 @@ IS (u|U|l|L)*
the value as a pointer */ the value as a pointer */
#define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x) #define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x)
static const char rcsid[] = "$Id: lexer.l,v 1.1 2003-09-21 22:46:55 ocoursiere Exp $"; static const char rcsid[] = "$Id: lexer.l,v 1.2 2003-10-20 22:46:40 jetsoni Exp $";
static void count(); static void count();
static void comment(); static void comment();

6
bepascal/source/tools/stubgen.so/cpp/parser.c
View File

@@ -69,7 +69,7 @@
* This grammar is only a subset of the real C++ language. * This grammar is only a subset of the real C++ language.
* *
* DATE: Thu Aug 15 13:10:06 EDT 1996 * DATE: Thu Aug 15 13:10:06 EDT 1996
* $Id: parser.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $ * $Id: parser.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $
* *
* Copyright (c) 1996-1998 Michael John Radwin * Copyright (c) 1996-1998 Michael John Radwin
* *
@@ -195,7 +195,7 @@
* }; * };
* *
* Error: * Error:
* stubgen version 2.0-beta $Revision: 1.4 $. * stubgen version 2.0-beta $Revision: 1.5 $.
* parse error at line 4, file test.H: * parse error at line 4, file test.H:
* public: * public:
* ^ * ^
@@ -415,7 +415,7 @@ extern int collectMemberInitList();
/* defined here in parser.y */ /* defined here in parser.y */
static int error_recovery(); static int error_recovery();
static int yyerror(char *); static int yyerror(char *);
static const char rcsid[] = "$Id: parser.c,v 1.4 2003-10-09 20:08:04 ocoursiere Exp $"; static const char rcsid[] = "$Id: parser.c,v 1.5 2003-10-20 22:46:40 jetsoni Exp $";
/* defined in main.c */ /* defined in main.c */
extern FILE *outfile; extern FILE *outfile;