shithub: riscv

Download patch

ref: cb3049652da75b7ac00a865cd518f29ff05b3155
parent: 4c21da2ededfb5fc628dbee0d75b0aa5263ef97b
author: cinap_lenrek <[email protected]>
date: Thu Apr 28 17:22:26 EDT 2016 

remove ape/regexp.h, remove leftover #pragma lib oldlibregexp.$O from upas/bayes/regexp.h


--- a/sys/include/ape/regexp.h
+++ /dev/null
@@ -1,77 +1,0 @@
-#ifndef __REGEXP_H
-#define __REGEXP_H
-#ifndef _REGEXP_EXTENSION
-    This header file is an extension to ANSI/POSIX
-#endif
-#pragma lib "/$M/lib/ape/libregexp.a"
-
-#ifdef	UTF
-#define	Runeself	0xA0
-#else
-#define	Runeself	0
-#endif
-
-typedef struct Resub		Resub;
-typedef struct Reclass		Reclass;
-typedef struct Reinst		Reinst;
-typedef struct Reprog		Reprog;
-
-/*
- *	Sub expression matches
- */
-struct Resub{
-	union
-	{
-		char *sp;
-		wchar_t *rsp;
-	} s;
-	union
-	{
-		char *ep;
-		wchar_t *rep;
-	} e;
-};
-
-/*
- *	character class, each pair of rune's defines a range
- */
-struct Reclass{
-	wchar_t	*end;
-	wchar_t	spans[64];
-};
-
-/*
- *	Machine instructions
- */
-struct Reinst{
-	int	type;			/* < 0200 ==> literal, otherwise action */
-	union	{
-		Reclass	*cp;		/* class pointer */
-		wchar_t	r;		/* character */
-		int	subid;		/* sub-expression id for RBRA and LBRA */
-		Reinst	*right;		/* right child of OR */
-	} r;
-	union {	/* regexp relies on these two being in the same union */
-		Reinst *left;		/* left child of OR */
-		Reinst *next;		/* next instruction for CAT & LBRA */
-	} l;
-};
-
-/*
- *	Reprogram definition
- */
-struct Reprog{
-	Reinst	*startinst;	/* start pc */
-	Reclass	class[16];	/* .data */
-	Reinst	firstinst[5];	/* .text */
-};
-
-extern Reprog	*regcomp(char*);
-extern Reprog	*regcomplit(char*);
-extern Reprog	*regcompnl(char*);
-extern void	regerror(char*);
-extern int	regexec(Reprog*, char*, Resub*, int);
-extern void	regsub(char*, char*, int, Resub*, int);
-extern int	rregexec(Reprog*, wchar_t*, Resub*, int);
-extern void	rregsub(wchar_t*, wchar_t*, int, Resub*, int);
-#endif
--- a/sys/src/cmd/upas/bayes/regexp.h
+++ b/sys/src/cmd/upas/bayes/regexp.h
@@ -1,6 +1,3 @@
-#pragma	src	"/sys/src/oldlibregexp"
-#pragma	lib	"oldlibregexp.a"
-
 typedef struct Resub		Resub;
 typedef struct Reclass		Reclass;
 typedef struct Reinst		Reinst;