diff options
| author | jhugunin <jhugunin> | 2003-04-10 18:55:01 +0000 |
|---|---|---|
| committer | jhugunin <jhugunin> | 2003-04-10 18:55:01 +0000 |
| commit | 901680409eced50d66a7910abc2f2bd85b6d77c5 (patch) | |
| tree | b3674fe8aa53c1588ae5fc2f258fc6c7a852848c | |
| parent | db88303198c38a91290443ba4347989b34be947f (diff) | |
| download | aspectj-901680409eced50d66a7910abc2f2bd85b6d77c5.tar.gz aspectj-901680409eced50d66a7910abc2f2bd85b6d77c5.zip | |
addressing line ending issues and matching with eclipse 2.1 minor changes
| -rw-r--r-- | org.aspectj.ajdt.core/scripts/makeparser.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.aspectj.ajdt.core/scripts/makeparser.py b/org.aspectj.ajdt.core/scripts/makeparser.py index a67aff10a..4b878f99b 100644 --- a/org.aspectj.ajdt.core/scripts/makeparser.py +++ b/org.aspectj.ajdt.core/scripts/makeparser.py @@ -45,11 +45,11 @@ if grammarFileRel == None: match = r.search(parserText) grammar = match.group(1) else: - grammar = readFile(path.join(eclipseWorkspace, grammarFileRel)) + grammar = readFile(path.join(eclipseWorkspace, grammarFileRel), 'b') #print grammar grammarFile = path.join(workingDir, "java.g") -writeFile(grammarFile, grammar) +writeFile(grammarFile, grammar, 'b') os.chdir(workingDir) os.system("%s java.g" % jikespg) @@ -101,7 +101,7 @@ writeFile(parserInfoFile, text) #3.4 This is the contents of the class org.eclipse.jdt.internal.compiler.parser.TerminalSymbols. defs = readFile(path.join(workingDir, "javasym.java")) -r = re.compile(r"(int[^;]*;)", re.DOTALL) +r = re.compile(r"(int\s+TokenNameIdentifier[^;]*;)", re.DOTALL) syms = r.search(defs).group(0) syms = syms.replace("$eof", "EOF") syms = syms.replace("$error", "ERROR") |